diff --git a/accessapproval/aliasshim/aliasshim.go b/accessapproval/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/accessapproval/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/accessapproval/apiv1/access_approval_client.go b/accessapproval/apiv1/access_approval_client.go
index 30761818248..42d4a58d289 100644
--- a/accessapproval/apiv1/access_approval_client.go
+++ b/accessapproval/apiv1/access_approval_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/accessapproval/apiv1/access_approval_client_example_test.go b/accessapproval/apiv1/access_approval_client_example_test.go
index 40c1fdc260e..1d7f8d6ff5f 100644
--- a/accessapproval/apiv1/access_approval_client_example_test.go
+++ b/accessapproval/apiv1/access_approval_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 	"google.golang.org/api/iterator"
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListApprovalRequests() {
 
 	req := &accessapprovalpb.ListApprovalRequestsMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#ListApprovalRequestsMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#ListApprovalRequestsMessage.
 	}
 	it := c.ListApprovalRequests(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetApprovalRequest() {
 
 	req := &accessapprovalpb.GetApprovalRequestMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#GetApprovalRequestMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#GetApprovalRequestMessage.
 	}
 	resp, err := c.GetApprovalRequest(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_ApproveApprovalRequest() {
 
 	req := &accessapprovalpb.ApproveApprovalRequestMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#ApproveApprovalRequestMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#ApproveApprovalRequestMessage.
 	}
 	resp, err := c.ApproveApprovalRequest(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleClient_DismissApprovalRequest() {
 
 	req := &accessapprovalpb.DismissApprovalRequestMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#DismissApprovalRequestMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#DismissApprovalRequestMessage.
 	}
 	resp, err := c.DismissApprovalRequest(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleClient_InvalidateApprovalRequest() {
 
 	req := &accessapprovalpb.InvalidateApprovalRequestMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#InvalidateApprovalRequestMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#InvalidateApprovalRequestMessage.
 	}
 	resp, err := c.InvalidateApprovalRequest(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleClient_GetAccessApprovalSettings() {
 
 	req := &accessapprovalpb.GetAccessApprovalSettingsMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#GetAccessApprovalSettingsMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#GetAccessApprovalSettingsMessage.
 	}
 	resp, err := c.GetAccessApprovalSettings(ctx, req)
 	if err != nil {
@@ -212,7 +212,7 @@ func ExampleClient_UpdateAccessApprovalSettings() {
 
 	req := &accessapprovalpb.UpdateAccessApprovalSettingsMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#UpdateAccessApprovalSettingsMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#UpdateAccessApprovalSettingsMessage.
 	}
 	resp, err := c.UpdateAccessApprovalSettings(ctx, req)
 	if err != nil {
@@ -237,7 +237,7 @@ func ExampleClient_DeleteAccessApprovalSettings() {
 
 	req := &accessapprovalpb.DeleteAccessApprovalSettingsMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#DeleteAccessApprovalSettingsMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#DeleteAccessApprovalSettingsMessage.
 	}
 	err = c.DeleteAccessApprovalSettings(ctx, req)
 	if err != nil {
@@ -260,7 +260,7 @@ func ExampleClient_GetAccessApprovalServiceAccount() {
 
 	req := &accessapprovalpb.GetAccessApprovalServiceAccountMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#GetAccessApprovalServiceAccountMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#GetAccessApprovalServiceAccountMessage.
 	}
 	resp, err := c.GetAccessApprovalServiceAccount(ctx, req)
 	if err != nil {
diff --git a/accessapproval/apiv1/accessapprovalpb/accessapproval.pb.go b/accessapproval/apiv1/accessapprovalpb/accessapproval.pb.go
index 4a79fbfb1e5..61350024aa1 100644
--- a/accessapproval/apiv1/accessapprovalpb/accessapproval.pb.go
+++ b/accessapproval/apiv1/accessapprovalpb/accessapproval.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/accessapproval/v1/accessapproval.proto
 
 package accessapprovalpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -417,11 +417,11 @@ type ApproveDecision struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time at which approval was granted.
-	ApproveTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=approve_time,json=approveTime,proto3" json:"approve_time,omitempty"`
+	ApproveTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=approve_time,json=approveTime,proto3" json:"approve_time,omitempty"`
 	// The time at which the approval expires.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// If set, denotes the timestamp at which the approval is invalidated.
-	InvalidateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=invalidate_time,json=invalidateTime,proto3" json:"invalidate_time,omitempty"`
+	InvalidateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=invalidate_time,json=invalidateTime,proto3" json:"invalidate_time,omitempty"`
 	// The signature for the ApprovalRequest and details on how it was signed.
 	SignatureInfo *SignatureInfo `protobuf:"bytes,4,opt,name=signature_info,json=signatureInfo,proto3" json:"signature_info,omitempty"`
 	// True when the request has been auto-approved.
@@ -460,21 +460,21 @@ func (*ApproveDecision) Descriptor() ([]byte, []int) {
 	return file_google_cloud_accessapproval_v1_accessapproval_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *ApproveDecision) GetApproveTime() *timestamp.Timestamp {
+func (x *ApproveDecision) GetApproveTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ApproveTime
 	}
 	return nil
 }
 
-func (x *ApproveDecision) GetExpireTime() *timestamp.Timestamp {
+func (x *ApproveDecision) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
 	return nil
 }
 
-func (x *ApproveDecision) GetInvalidateTime() *timestamp.Timestamp {
+func (x *ApproveDecision) GetInvalidateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.InvalidateTime
 	}
@@ -502,7 +502,7 @@ type DismissDecision struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time at which the approval request was dismissed.
-	DismissTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=dismiss_time,json=dismissTime,proto3" json:"dismiss_time,omitempty"`
+	DismissTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=dismiss_time,json=dismissTime,proto3" json:"dismiss_time,omitempty"`
 	// This field will be true if the ApprovalRequest was implicitly dismissed due
 	// to inaction by the access approval approvers (the request is not acted
 	// on by the approvers before the exiration time).
@@ -541,7 +541,7 @@ func (*DismissDecision) Descriptor() ([]byte, []int) {
 	return file_google_cloud_accessapproval_v1_accessapproval_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *DismissDecision) GetDismissTime() *timestamp.Timestamp {
+func (x *DismissDecision) GetDismissTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DismissTime
 	}
@@ -629,10 +629,10 @@ type ApprovalRequest struct {
 	// The locations for which approval is being requested.
 	RequestedLocations *AccessLocations `protobuf:"bytes,4,opt,name=requested_locations,json=requestedLocations,proto3" json:"requested_locations,omitempty"`
 	// The time at which approval was requested.
-	RequestTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
+	RequestTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// The requested expiration for the approval. If the request is approved,
 	// access will be granted from the time of approval until the expiration time.
-	RequestedExpiration *timestamp.Timestamp `protobuf:"bytes,6,opt,name=requested_expiration,json=requestedExpiration,proto3" json:"requested_expiration,omitempty"`
+	RequestedExpiration *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=requested_expiration,json=requestedExpiration,proto3" json:"requested_expiration,omitempty"`
 	// The current decision on the approval request.
 	//
 	// Types that are assignable to Decision:
@@ -709,14 +709,14 @@ func (x *ApprovalRequest) GetRequestedLocations() *AccessLocations {
 	return nil
 }
 
-func (x *ApprovalRequest) GetRequestTime() *timestamp.Timestamp {
+func (x *ApprovalRequest) GetRequestTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RequestTime
 	}
 	return nil
 }
 
-func (x *ApprovalRequest) GetRequestedExpiration() *timestamp.Timestamp {
+func (x *ApprovalRequest) GetRequestedExpiration() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RequestedExpiration
 	}
@@ -1285,7 +1285,7 @@ type ApproveApprovalRequestMessage struct {
 	// Name of the approval request to approve.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The expiration time of this approval.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *ApproveApprovalRequestMessage) Reset() {
@@ -1327,7 +1327,7 @@ func (x *ApproveApprovalRequestMessage) GetName() string {
 	return ""
 }
 
-func (x *ApproveApprovalRequestMessage) GetExpireTime() *timestamp.Timestamp {
+func (x *ApproveApprovalRequestMessage) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -1500,7 +1500,7 @@ type UpdateAccessApprovalSettingsMessage struct {
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
 	// If this field is left unset, only the notification_emails field will be
 	// updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAccessApprovalSettingsMessage) Reset() {
@@ -1542,7 +1542,7 @@ func (x *UpdateAccessApprovalSettingsMessage) GetSettings() *AccessApprovalSetti
 	return nil
 }
 
-func (x *UpdateAccessApprovalSettingsMessage) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAccessApprovalSettingsMessage) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2199,9 +2199,9 @@ var file_google_cloud_accessapproval_v1_accessapproval_proto_goTypes = []interfa
 	(*UpdateAccessApprovalSettingsMessage)(nil),    // 19: google.cloud.accessapproval.v1.UpdateAccessApprovalSettingsMessage
 	(*DeleteAccessApprovalSettingsMessage)(nil),    // 20: google.cloud.accessapproval.v1.DeleteAccessApprovalSettingsMessage
 	(*GetAccessApprovalServiceAccountMessage)(nil), // 21: google.cloud.accessapproval.v1.GetAccessApprovalServiceAccountMessage
-	(*timestamp.Timestamp)(nil),                    // 22: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                   // 23: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                            // 24: google.protobuf.Empty
+	(*timestamppb.Timestamp)(nil),                  // 22: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                  // 23: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                          // 24: google.protobuf.Empty
 }
 var file_google_cloud_accessapproval_v1_accessapproval_proto_depIdxs = []int32{
 	1,  // 0: google.cloud.accessapproval.v1.AccessReason.type:type_name -> google.cloud.accessapproval.v1.AccessReason.Type
@@ -2578,7 +2578,7 @@ type AccessApprovalClient interface {
 	// Approval disabled. If Access Approval is enabled at a higher level of the
 	// hierarchy, then Access Approval will still be enabled at this level as
 	// the settings are inherited.
-	DeleteAccessApprovalSettings(ctx context.Context, in *DeleteAccessApprovalSettingsMessage, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAccessApprovalSettings(ctx context.Context, in *DeleteAccessApprovalSettingsMessage, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Retrieves the service account that is used by Access Approval to access KMS
 	// keys for signing approved approval requests.
 	GetAccessApprovalServiceAccount(ctx context.Context, in *GetAccessApprovalServiceAccountMessage, opts ...grpc.CallOption) (*AccessApprovalServiceAccount, error)
@@ -2655,8 +2655,8 @@ func (c *accessApprovalClient) UpdateAccessApprovalSettings(ctx context.Context,
 	return out, nil
 }
 
-func (c *accessApprovalClient) DeleteAccessApprovalSettings(ctx context.Context, in *DeleteAccessApprovalSettingsMessage, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *accessApprovalClient) DeleteAccessApprovalSettings(ctx context.Context, in *DeleteAccessApprovalSettingsMessage, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.accessapproval.v1.AccessApproval/DeleteAccessApprovalSettings", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2717,7 +2717,7 @@ type AccessApprovalServer interface {
 	// Approval disabled. If Access Approval is enabled at a higher level of the
 	// hierarchy, then Access Approval will still be enabled at this level as
 	// the settings are inherited.
-	DeleteAccessApprovalSettings(context.Context, *DeleteAccessApprovalSettingsMessage) (*empty.Empty, error)
+	DeleteAccessApprovalSettings(context.Context, *DeleteAccessApprovalSettingsMessage) (*emptypb.Empty, error)
 	// Retrieves the service account that is used by Access Approval to access KMS
 	// keys for signing approved approval requests.
 	GetAccessApprovalServiceAccount(context.Context, *GetAccessApprovalServiceAccountMessage) (*AccessApprovalServiceAccount, error)
@@ -2748,7 +2748,7 @@ func (*UnimplementedAccessApprovalServer) GetAccessApprovalSettings(context.Cont
 func (*UnimplementedAccessApprovalServer) UpdateAccessApprovalSettings(context.Context, *UpdateAccessApprovalSettingsMessage) (*AccessApprovalSettings, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateAccessApprovalSettings not implemented")
 }
-func (*UnimplementedAccessApprovalServer) DeleteAccessApprovalSettings(context.Context, *DeleteAccessApprovalSettingsMessage) (*empty.Empty, error) {
+func (*UnimplementedAccessApprovalServer) DeleteAccessApprovalSettings(context.Context, *DeleteAccessApprovalSettingsMessage) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAccessApprovalSettings not implemented")
 }
 func (*UnimplementedAccessApprovalServer) GetAccessApprovalServiceAccount(context.Context, *GetAccessApprovalServiceAccountMessage) (*AccessApprovalServiceAccount, error) {
diff --git a/accessapproval/apiv1/doc.go b/accessapproval/apiv1/doc.go
index 5a252e38960..6cb86572980 100644
--- a/accessapproval/apiv1/doc.go
+++ b/accessapproval/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &accessapprovalpb.ListApprovalRequestsMessage{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#ListApprovalRequestsMessage.
+//		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#ListApprovalRequestsMessage.
 //	}
 //	it := c.ListApprovalRequests(ctx, req)
 //	for {
diff --git a/accessapproval/go.mod b/accessapproval/go.mod
index c987efe6541..a0838ff2670 100644
--- a/accessapproval/go.mod
+++ b/accessapproval/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/accessapproval
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/accessapproval/go.sum b/accessapproval/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/accessapproval/go.sum
+++ b/accessapproval/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/accesscontextmanager/aliasshim/aliasshim.go b/accesscontextmanager/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/accesscontextmanager/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/accesscontextmanager/apiv1/access_context_manager_client.go b/accesscontextmanager/apiv1/access_context_manager_client.go
index b602404cad2..67260504bc6 100644
--- a/accesscontextmanager/apiv1/access_context_manager_client.go
+++ b/accesscontextmanager/apiv1/access_context_manager_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/accesscontextmanager/apiv1/access_context_manager_client_example_test.go b/accesscontextmanager/apiv1/access_context_manager_client_example_test.go
index 31e6465700a..62b99a4ff9e 100644
--- a/accesscontextmanager/apiv1/access_context_manager_client_example_test.go
+++ b/accesscontextmanager/apiv1/access_context_manager_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 	"google.golang.org/api/iterator"
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListAccessPolicies() {
 
 	req := &accesscontextmanagerpb.ListAccessPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListAccessPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListAccessPoliciesRequest.
 	}
 	it := c.ListAccessPolicies(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetAccessPolicy() {
 
 	req := &accesscontextmanagerpb.GetAccessPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#GetAccessPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#GetAccessPolicyRequest.
 	}
 	resp, err := c.GetAccessPolicy(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_CreateAccessPolicy() {
 
 	req := &accesscontextmanagerpb.AccessPolicy{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#AccessPolicy.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#AccessPolicy.
 	}
 	op, err := c.CreateAccessPolicy(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleClient_UpdateAccessPolicy() {
 
 	req := &accesscontextmanagerpb.UpdateAccessPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#UpdateAccessPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#UpdateAccessPolicyRequest.
 	}
 	op, err := c.UpdateAccessPolicy(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleClient_DeleteAccessPolicy() {
 
 	req := &accesscontextmanagerpb.DeleteAccessPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#DeleteAccessPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#DeleteAccessPolicyRequest.
 	}
 	op, err := c.DeleteAccessPolicy(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleClient_ListAccessLevels() {
 
 	req := &accesscontextmanagerpb.ListAccessLevelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListAccessLevelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListAccessLevelsRequest.
 	}
 	it := c.ListAccessLevels(ctx, req)
 	for {
@@ -231,7 +231,7 @@ func ExampleClient_GetAccessLevel() {
 
 	req := &accesscontextmanagerpb.GetAccessLevelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#GetAccessLevelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#GetAccessLevelRequest.
 	}
 	resp, err := c.GetAccessLevel(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleClient_CreateAccessLevel() {
 
 	req := &accesscontextmanagerpb.CreateAccessLevelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#CreateAccessLevelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#CreateAccessLevelRequest.
 	}
 	op, err := c.CreateAccessLevel(ctx, req)
 	if err != nil {
@@ -286,7 +286,7 @@ func ExampleClient_UpdateAccessLevel() {
 
 	req := &accesscontextmanagerpb.UpdateAccessLevelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#UpdateAccessLevelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#UpdateAccessLevelRequest.
 	}
 	op, err := c.UpdateAccessLevel(ctx, req)
 	if err != nil {
@@ -316,7 +316,7 @@ func ExampleClient_DeleteAccessLevel() {
 
 	req := &accesscontextmanagerpb.DeleteAccessLevelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#DeleteAccessLevelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#DeleteAccessLevelRequest.
 	}
 	op, err := c.DeleteAccessLevel(ctx, req)
 	if err != nil {
@@ -344,7 +344,7 @@ func ExampleClient_ReplaceAccessLevels() {
 
 	req := &accesscontextmanagerpb.ReplaceAccessLevelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ReplaceAccessLevelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ReplaceAccessLevelsRequest.
 	}
 	op, err := c.ReplaceAccessLevels(ctx, req)
 	if err != nil {
@@ -374,7 +374,7 @@ func ExampleClient_ListServicePerimeters() {
 
 	req := &accesscontextmanagerpb.ListServicePerimetersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListServicePerimetersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListServicePerimetersRequest.
 	}
 	it := c.ListServicePerimeters(ctx, req)
 	for {
@@ -405,7 +405,7 @@ func ExampleClient_GetServicePerimeter() {
 
 	req := &accesscontextmanagerpb.GetServicePerimeterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#GetServicePerimeterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#GetServicePerimeterRequest.
 	}
 	resp, err := c.GetServicePerimeter(ctx, req)
 	if err != nil {
@@ -430,7 +430,7 @@ func ExampleClient_CreateServicePerimeter() {
 
 	req := &accesscontextmanagerpb.CreateServicePerimeterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#CreateServicePerimeterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#CreateServicePerimeterRequest.
 	}
 	op, err := c.CreateServicePerimeter(ctx, req)
 	if err != nil {
@@ -460,7 +460,7 @@ func ExampleClient_UpdateServicePerimeter() {
 
 	req := &accesscontextmanagerpb.UpdateServicePerimeterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#UpdateServicePerimeterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#UpdateServicePerimeterRequest.
 	}
 	op, err := c.UpdateServicePerimeter(ctx, req)
 	if err != nil {
@@ -490,7 +490,7 @@ func ExampleClient_DeleteServicePerimeter() {
 
 	req := &accesscontextmanagerpb.DeleteServicePerimeterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#DeleteServicePerimeterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#DeleteServicePerimeterRequest.
 	}
 	op, err := c.DeleteServicePerimeter(ctx, req)
 	if err != nil {
@@ -518,7 +518,7 @@ func ExampleClient_ReplaceServicePerimeters() {
 
 	req := &accesscontextmanagerpb.ReplaceServicePerimetersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ReplaceServicePerimetersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ReplaceServicePerimetersRequest.
 	}
 	op, err := c.ReplaceServicePerimeters(ctx, req)
 	if err != nil {
@@ -548,7 +548,7 @@ func ExampleClient_CommitServicePerimeters() {
 
 	req := &accesscontextmanagerpb.CommitServicePerimetersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#CommitServicePerimetersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#CommitServicePerimetersRequest.
 	}
 	op, err := c.CommitServicePerimeters(ctx, req)
 	if err != nil {
@@ -578,7 +578,7 @@ func ExampleClient_ListGcpUserAccessBindings() {
 
 	req := &accesscontextmanagerpb.ListGcpUserAccessBindingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListGcpUserAccessBindingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListGcpUserAccessBindingsRequest.
 	}
 	it := c.ListGcpUserAccessBindings(ctx, req)
 	for {
@@ -609,7 +609,7 @@ func ExampleClient_GetGcpUserAccessBinding() {
 
 	req := &accesscontextmanagerpb.GetGcpUserAccessBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#GetGcpUserAccessBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#GetGcpUserAccessBindingRequest.
 	}
 	resp, err := c.GetGcpUserAccessBinding(ctx, req)
 	if err != nil {
@@ -634,7 +634,7 @@ func ExampleClient_CreateGcpUserAccessBinding() {
 
 	req := &accesscontextmanagerpb.CreateGcpUserAccessBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#CreateGcpUserAccessBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#CreateGcpUserAccessBindingRequest.
 	}
 	op, err := c.CreateGcpUserAccessBinding(ctx, req)
 	if err != nil {
@@ -664,7 +664,7 @@ func ExampleClient_UpdateGcpUserAccessBinding() {
 
 	req := &accesscontextmanagerpb.UpdateGcpUserAccessBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#UpdateGcpUserAccessBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#UpdateGcpUserAccessBindingRequest.
 	}
 	op, err := c.UpdateGcpUserAccessBinding(ctx, req)
 	if err != nil {
@@ -694,7 +694,7 @@ func ExampleClient_DeleteGcpUserAccessBinding() {
 
 	req := &accesscontextmanagerpb.DeleteGcpUserAccessBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#DeleteGcpUserAccessBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#DeleteGcpUserAccessBindingRequest.
 	}
 	op, err := c.DeleteGcpUserAccessBinding(ctx, req)
 	if err != nil {
diff --git a/accesscontextmanager/apiv1/accesscontextmanagerpb/access_context_manager.pb.go b/accesscontextmanager/apiv1/accesscontextmanagerpb/access_context_manager.pb.go
index 040efa00d5c..b739c11cfef 100644
--- a/accesscontextmanager/apiv1/accesscontextmanagerpb/access_context_manager.pb.go
+++ b/accesscontextmanager/apiv1/accesscontextmanagerpb/access_context_manager.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/identity/accesscontextmanager/v1/access_context_manager.proto
 
 package accesscontextmanagerpb
@@ -27,12 +27,12 @@ import (
 
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -288,7 +288,7 @@ type UpdateAccessPolicyRequest struct {
 	// Required. The updated AccessPolicy.
 	Policy *AccessPolicy `protobuf:"bytes,1,opt,name=policy,proto3" json:"policy,omitempty"`
 	// Required. Mask to control which fields get updated. Must be non-empty.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAccessPolicyRequest) Reset() {
@@ -330,7 +330,7 @@ func (x *UpdateAccessPolicyRequest) GetPolicy() *AccessPolicy {
 	return nil
 }
 
-func (x *UpdateAccessPolicyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAccessPolicyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -681,7 +681,7 @@ type UpdateAccessLevelRequest struct {
 	// precondition for creation.
 	AccessLevel *AccessLevel `protobuf:"bytes,1,opt,name=access_level,json=accessLevel,proto3" json:"access_level,omitempty"`
 	// Required. Mask to control which fields get updated. Must be non-empty.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAccessLevelRequest) Reset() {
@@ -723,7 +723,7 @@ func (x *UpdateAccessLevelRequest) GetAccessLevel() *AccessLevel {
 	return nil
 }
 
-func (x *UpdateAccessLevelRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAccessLevelRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1180,7 +1180,7 @@ type UpdateServicePerimeterRequest struct {
 	// `ServicePerimeter` is a precondition for creation.
 	ServicePerimeter *ServicePerimeter `protobuf:"bytes,1,opt,name=service_perimeter,json=servicePerimeter,proto3" json:"service_perimeter,omitempty"`
 	// Required. Mask to control which fields get updated. Must be non-empty.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateServicePerimeterRequest) Reset() {
@@ -1222,7 +1222,7 @@ func (x *UpdateServicePerimeterRequest) GetServicePerimeter() *ServicePerimeter
 	return nil
 }
 
-func (x *UpdateServicePerimeterRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateServicePerimeterRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1799,7 +1799,7 @@ type UpdateGcpUserAccessBindingRequest struct {
 	// update_mask {
 	// paths: "access_levels"
 	// }
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateGcpUserAccessBindingRequest) Reset() {
@@ -1841,7 +1841,7 @@ func (x *UpdateGcpUserAccessBindingRequest) GetGcpUserAccessBinding() *GcpUserAc
 	return nil
 }
 
-func (x *UpdateGcpUserAccessBindingRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateGcpUserAccessBindingRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2779,7 +2779,7 @@ var file_google_identity_accesscontextmanager_v1_access_context_manager_proto_go
 	(*GcpUserAccessBindingOperationMetadata)(nil), // 30: google.identity.accesscontextmanager.v1.GcpUserAccessBindingOperationMetadata
 	(*AccessContextManagerOperationMetadata)(nil), // 31: google.identity.accesscontextmanager.v1.AccessContextManagerOperationMetadata
 	(*AccessPolicy)(nil),                          // 32: google.identity.accesscontextmanager.v1.AccessPolicy
-	(*field_mask.FieldMask)(nil),                  // 33: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                 // 33: google.protobuf.FieldMask
 	(*AccessLevel)(nil),                           // 34: google.identity.accesscontextmanager.v1.AccessLevel
 	(*ServicePerimeter)(nil),                      // 35: google.identity.accesscontextmanager.v1.ServicePerimeter
 	(*GcpUserAccessBinding)(nil),                  // 36: google.identity.accesscontextmanager.v1.GcpUserAccessBinding
diff --git a/accesscontextmanager/apiv1/accesscontextmanagerpb/access_level.pb.go b/accesscontextmanager/apiv1/accesscontextmanagerpb/access_level.pb.go
index 38ae468b271..1feeb66c2da 100644
--- a/accesscontextmanager/apiv1/accesscontextmanagerpb/access_level.pb.go
+++ b/accesscontextmanager/apiv1/accesscontextmanagerpb/access_level.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/identity/accesscontextmanager/v1/access_level.proto
 
 package accesscontextmanagerpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	_type "google.golang.org/genproto/googleapis/identity/accesscontextmanager/type"
 	expr "google.golang.org/genproto/googleapis/type/expr"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -114,9 +114,9 @@ type AccessLevel struct {
 	//	*AccessLevel_Custom
 	Level isAccessLevel_Level `protobuf_oneof:"level"`
 	// Output only. Time the `AccessLevel` was created in UTC.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time the `AccessLevel` was updated in UTC.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *AccessLevel) Reset() {
@@ -193,14 +193,14 @@ func (x *AccessLevel) GetCustom() *CustomLevel {
 	return nil
 }
 
-func (x *AccessLevel) GetCreateTime() *timestamp.Timestamp {
+func (x *AccessLevel) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AccessLevel) GetUpdateTime() *timestamp.Timestamp {
+func (x *AccessLevel) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -808,7 +808,7 @@ var file_google_identity_accesscontextmanager_v1_access_level_proto_goTypes = []
 	(*CustomLevel)(nil),                        // 4: google.identity.accesscontextmanager.v1.CustomLevel
 	(*DevicePolicy)(nil),                       // 5: google.identity.accesscontextmanager.v1.DevicePolicy
 	(*OsConstraint)(nil),                       // 6: google.identity.accesscontextmanager.v1.OsConstraint
-	(*timestamp.Timestamp)(nil),                // 7: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),              // 7: google.protobuf.Timestamp
 	(*expr.Expr)(nil),                          // 8: google.type.Expr
 	(_type.DeviceEncryptionStatus)(0),          // 9: google.identity.accesscontextmanager.type.DeviceEncryptionStatus
 	(_type.DeviceManagementLevel)(0),           // 10: google.identity.accesscontextmanager.type.DeviceManagementLevel
diff --git a/accesscontextmanager/apiv1/accesscontextmanagerpb/access_policy.pb.go b/accesscontextmanager/apiv1/accesscontextmanagerpb/access_policy.pb.go
index 695626cbdb1..31c98c114db 100644
--- a/accesscontextmanager/apiv1/accesscontextmanagerpb/access_policy.pb.go
+++ b/accesscontextmanager/apiv1/accesscontextmanagerpb/access_policy.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/identity/accesscontextmanager/v1/access_policy.proto
 
 package accesscontextmanagerpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -57,9 +57,9 @@ type AccessPolicy struct {
 	// Required. Human readable title. Does not affect behavior.
 	Title string `protobuf:"bytes,3,opt,name=title,proto3" json:"title,omitempty"`
 	// Output only. Time the `AccessPolicy` was created in UTC.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time the `AccessPolicy` was updated in UTC.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. An opaque identifier for the current version of the
 	// `AccessPolicy`. This will always be a strongly validated etag, meaning that
 	// two Access Polices will be identical if and only if their etags are
@@ -120,14 +120,14 @@ func (x *AccessPolicy) GetTitle() string {
 	return ""
 }
 
-func (x *AccessPolicy) GetCreateTime() *timestamp.Timestamp {
+func (x *AccessPolicy) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AccessPolicy) GetUpdateTime() *timestamp.Timestamp {
+func (x *AccessPolicy) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -209,8 +209,8 @@ func file_google_identity_accesscontextmanager_v1_access_policy_proto_rawDescGZI
 
 var file_google_identity_accesscontextmanager_v1_access_policy_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_identity_accesscontextmanager_v1_access_policy_proto_goTypes = []interface{}{
-	(*AccessPolicy)(nil),        // 0: google.identity.accesscontextmanager.v1.AccessPolicy
-	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+	(*AccessPolicy)(nil),          // 0: google.identity.accesscontextmanager.v1.AccessPolicy
+	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 }
 var file_google_identity_accesscontextmanager_v1_access_policy_proto_depIdxs = []int32{
 	1, // 0: google.identity.accesscontextmanager.v1.AccessPolicy.create_time:type_name -> google.protobuf.Timestamp
diff --git a/accesscontextmanager/apiv1/accesscontextmanagerpb/gcp_user_access_binding.pb.go b/accesscontextmanager/apiv1/accesscontextmanagerpb/gcp_user_access_binding.pb.go
index de49bec194e..e75c5550b9d 100644
--- a/accesscontextmanager/apiv1/accesscontextmanagerpb/gcp_user_access_binding.pb.go
+++ b/accesscontextmanager/apiv1/accesscontextmanagerpb/gcp_user_access_binding.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/identity/accesscontextmanager/v1/gcp_user_access_binding.proto
 
 package accesscontextmanagerpb
diff --git a/accesscontextmanager/apiv1/accesscontextmanagerpb/service_perimeter.pb.go b/accesscontextmanager/apiv1/accesscontextmanagerpb/service_perimeter.pb.go
index 5ff208ba468..1a27602a647 100644
--- a/accesscontextmanager/apiv1/accesscontextmanagerpb/service_perimeter.pb.go
+++ b/accesscontextmanager/apiv1/accesscontextmanagerpb/service_perimeter.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/identity/accesscontextmanager/v1/service_perimeter.proto
 
 package accesscontextmanagerpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -188,9 +188,9 @@ type ServicePerimeter struct {
 	// behavior.
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. Time the `ServicePerimeter` was created in UTC.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time the `ServicePerimeter` was updated in UTC.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Perimeter type indicator. A single project is
 	// allowed to be a member of single regular perimeter, but multiple service
 	// perimeter bridges. A project cannot be a included in a perimeter bridge
@@ -273,14 +273,14 @@ func (x *ServicePerimeter) GetDescription() string {
 	return ""
 }
 
-func (x *ServicePerimeter) GetCreateTime() *timestamp.Timestamp {
+func (x *ServicePerimeter) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ServicePerimeter) GetUpdateTime() *timestamp.Timestamp {
+func (x *ServicePerimeter) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1518,7 +1518,7 @@ var file_google_identity_accesscontextmanager_v1_service_perimeter_proto_goTypes
 	(*ServicePerimeterConfig_IngressPolicy)(nil),         // 11: google.identity.accesscontextmanager.v1.ServicePerimeterConfig.IngressPolicy
 	(*ServicePerimeterConfig_EgressPolicy)(nil),          // 12: google.identity.accesscontextmanager.v1.ServicePerimeterConfig.EgressPolicy
 	(*ServicePerimeterConfig_EgressFrom)(nil),            // 13: google.identity.accesscontextmanager.v1.ServicePerimeterConfig.EgressFrom
-	(*timestamp.Timestamp)(nil),                          // 14: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                        // 14: google.protobuf.Timestamp
 }
 var file_google_identity_accesscontextmanager_v1_service_perimeter_proto_depIdxs = []int32{
 	14, // 0: google.identity.accesscontextmanager.v1.ServicePerimeter.create_time:type_name -> google.protobuf.Timestamp
diff --git a/accesscontextmanager/apiv1/doc.go b/accesscontextmanager/apiv1/doc.go
index 2f10cb3fd2c..0cef3506ebb 100644
--- a/accesscontextmanager/apiv1/doc.go
+++ b/accesscontextmanager/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &accesscontextmanagerpb.ListAccessPoliciesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListAccessPoliciesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListAccessPoliciesRequest.
 //	}
 //	it := c.ListAccessPolicies(ctx, req)
 //	for {
diff --git a/accesscontextmanager/go.mod b/accesscontextmanager/go.mod
index 6eefdd8cafd..5b968fd1af6 100644
--- a/accesscontextmanager/go.mod
+++ b/accesscontextmanager/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/accesscontextmanager
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/accesscontextmanager/go.sum b/accesscontextmanager/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/accesscontextmanager/go.sum
+++ b/accesscontextmanager/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/apigateway/aliasshim/aliasshim.go b/apigateway/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/apigateway/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/apigateway/apiv1/api_gateway_client.go b/apigateway/apiv1/api_gateway_client.go
index 84cb1325a94..7d6826e4819 100644
--- a/apigateway/apiv1/api_gateway_client.go
+++ b/apigateway/apiv1/api_gateway_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/apigateway/apiv1/api_gateway_client_example_test.go b/apigateway/apiv1/api_gateway_client_example_test.go
index 956d9d5c958..fbbab8eccd5 100644
--- a/apigateway/apiv1/api_gateway_client_example_test.go
+++ b/apigateway/apiv1/api_gateway_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 	"google.golang.org/api/iterator"
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListGateways() {
 
 	req := &apigatewaypb.ListGatewaysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#ListGatewaysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#ListGatewaysRequest.
 	}
 	it := c.ListGateways(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetGateway() {
 
 	req := &apigatewaypb.GetGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#GetGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#GetGatewayRequest.
 	}
 	resp, err := c.GetGateway(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_CreateGateway() {
 
 	req := &apigatewaypb.CreateGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#CreateGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#CreateGatewayRequest.
 	}
 	op, err := c.CreateGateway(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleClient_UpdateGateway() {
 
 	req := &apigatewaypb.UpdateGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#UpdateGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#UpdateGatewayRequest.
 	}
 	op, err := c.UpdateGateway(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleClient_DeleteGateway() {
 
 	req := &apigatewaypb.DeleteGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#DeleteGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#DeleteGatewayRequest.
 	}
 	op, err := c.DeleteGateway(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleClient_ListApis() {
 
 	req := &apigatewaypb.ListApisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#ListApisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#ListApisRequest.
 	}
 	it := c.ListApis(ctx, req)
 	for {
@@ -231,7 +231,7 @@ func ExampleClient_GetApi() {
 
 	req := &apigatewaypb.GetApiRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#GetApiRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#GetApiRequest.
 	}
 	resp, err := c.GetApi(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleClient_CreateApi() {
 
 	req := &apigatewaypb.CreateApiRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#CreateApiRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#CreateApiRequest.
 	}
 	op, err := c.CreateApi(ctx, req)
 	if err != nil {
@@ -286,7 +286,7 @@ func ExampleClient_UpdateApi() {
 
 	req := &apigatewaypb.UpdateApiRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#UpdateApiRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#UpdateApiRequest.
 	}
 	op, err := c.UpdateApi(ctx, req)
 	if err != nil {
@@ -316,7 +316,7 @@ func ExampleClient_DeleteApi() {
 
 	req := &apigatewaypb.DeleteApiRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#DeleteApiRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#DeleteApiRequest.
 	}
 	op, err := c.DeleteApi(ctx, req)
 	if err != nil {
@@ -344,7 +344,7 @@ func ExampleClient_ListApiConfigs() {
 
 	req := &apigatewaypb.ListApiConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#ListApiConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#ListApiConfigsRequest.
 	}
 	it := c.ListApiConfigs(ctx, req)
 	for {
@@ -375,7 +375,7 @@ func ExampleClient_GetApiConfig() {
 
 	req := &apigatewaypb.GetApiConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#GetApiConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#GetApiConfigRequest.
 	}
 	resp, err := c.GetApiConfig(ctx, req)
 	if err != nil {
@@ -400,7 +400,7 @@ func ExampleClient_CreateApiConfig() {
 
 	req := &apigatewaypb.CreateApiConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#CreateApiConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#CreateApiConfigRequest.
 	}
 	op, err := c.CreateApiConfig(ctx, req)
 	if err != nil {
@@ -430,7 +430,7 @@ func ExampleClient_UpdateApiConfig() {
 
 	req := &apigatewaypb.UpdateApiConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#UpdateApiConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#UpdateApiConfigRequest.
 	}
 	op, err := c.UpdateApiConfig(ctx, req)
 	if err != nil {
@@ -460,7 +460,7 @@ func ExampleClient_DeleteApiConfig() {
 
 	req := &apigatewaypb.DeleteApiConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#DeleteApiConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#DeleteApiConfigRequest.
 	}
 	op, err := c.DeleteApiConfig(ctx, req)
 	if err != nil {
diff --git a/apigateway/apiv1/apigatewaypb/apigateway.pb.go b/apigateway/apiv1/apigatewaypb/apigateway.pb.go
index ffb5c8548ad..e3623dd464f 100644
--- a/apigateway/apiv1/apigatewaypb/apigateway.pb.go
+++ b/apigateway/apiv1/apigatewaypb/apigateway.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/apigateway/v1/apigateway.proto
 
 package apigatewaypb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -300,9 +300,9 @@ type Api struct {
 	// Format: projects/{project}/locations/global/apis/{api}
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. Created time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Updated time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Resource labels to represent user-provided metadata.
 	// Refer to cloud documentation on labels for more details.
 	// https://cloud.google.com/compute/docs/labeling-resources
@@ -357,14 +357,14 @@ func (x *Api) GetName() string {
 	return ""
 }
 
-func (x *Api) GetCreateTime() *timestamp.Timestamp {
+func (x *Api) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Api) GetUpdateTime() *timestamp.Timestamp {
+func (x *Api) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -410,9 +410,9 @@ type ApiConfig struct {
 	// Format: projects/{project}/locations/global/apis/{api}/configs/{api_config}
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. Created time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Updated time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Resource labels to represent user-provided metadata.
 	// Refer to cloud documentation on labels for more details.
 	// https://cloud.google.com/compute/docs/labeling-resources
@@ -492,14 +492,14 @@ func (x *ApiConfig) GetName() string {
 	return ""
 }
 
-func (x *ApiConfig) GetCreateTime() *timestamp.Timestamp {
+func (x *ApiConfig) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ApiConfig) GetUpdateTime() *timestamp.Timestamp {
+func (x *ApiConfig) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -574,9 +574,9 @@ type Gateway struct {
 	// Format: projects/{project}/locations/{location}/gateways/{gateway}
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. Created time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Updated time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Resource labels to represent user-provided metadata.
 	// Refer to cloud documentation on labels for more details.
 	// https://cloud.google.com/compute/docs/labeling-resources
@@ -632,14 +632,14 @@ func (x *Gateway) GetName() string {
 	return ""
 }
 
-func (x *Gateway) GetCreateTime() *timestamp.Timestamp {
+func (x *Gateway) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Gateway) GetUpdateTime() *timestamp.Timestamp {
+func (x *Gateway) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -964,7 +964,7 @@ type UpdateGatewayRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Gateway resource.
 	Gateway *Gateway `protobuf:"bytes,2,opt,name=gateway,proto3" json:"gateway,omitempty"`
 }
@@ -1001,7 +1001,7 @@ func (*UpdateGatewayRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_apigateway_v1_apigateway_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *UpdateGatewayRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateGatewayRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1348,7 +1348,7 @@ type UpdateApiRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. API resource.
 	Api *Api `protobuf:"bytes,2,opt,name=api,proto3" json:"api,omitempty"`
 }
@@ -1385,7 +1385,7 @@ func (*UpdateApiRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_apigateway_v1_apigateway_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *UpdateApiRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateApiRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1742,7 +1742,7 @@ type UpdateApiConfigRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. API Config resource.
 	ApiConfig *ApiConfig `protobuf:"bytes,2,opt,name=api_config,json=apiConfig,proto3" json:"api_config,omitempty"`
 }
@@ -1779,7 +1779,7 @@ func (*UpdateApiConfigRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_apigateway_v1_apigateway_proto_rawDescGZIP(), []int{19}
 }
 
-func (x *UpdateApiConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateApiConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1850,9 +1850,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -1902,14 +1902,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_apigateway_v1_apigateway_proto_rawDescGZIP(), []int{21}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2676,8 +2676,8 @@ var file_google_cloud_apigateway_v1_apigateway_proto_goTypes = []interface{}{
 	nil,                                     // 30: google.cloud.apigateway.v1.ApiConfig.LabelsEntry
 	nil,                                     // 31: google.cloud.apigateway.v1.Gateway.LabelsEntry
 	(*OperationMetadata_Diagnostic)(nil),    // 32: google.cloud.apigateway.v1.OperationMetadata.Diagnostic
-	(*timestamp.Timestamp)(nil),             // 33: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),            // 34: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),           // 33: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),           // 34: google.protobuf.FieldMask
 }
 var file_google_cloud_apigateway_v1_apigateway_proto_depIdxs = []int32{
 	33, // 0: google.cloud.apigateway.v1.Api.create_time:type_name -> google.protobuf.Timestamp
diff --git a/apigateway/apiv1/apigatewaypb/apigateway_service.pb.go b/apigateway/apiv1/apigatewaypb/apigateway_service.pb.go
index 7dd9088748a..fda2e5e56b6 100644
--- a/apigateway/apiv1/apigatewaypb/apigateway_service.pb.go
+++ b/apigateway/apiv1/apigatewaypb/apigateway_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/apigateway/v1/apigateway_service.proto
 
 package apigatewaypb
diff --git a/apigateway/apiv1/doc.go b/apigateway/apiv1/doc.go
index a08c0c3775e..5a85210984a 100644
--- a/apigateway/apiv1/doc.go
+++ b/apigateway/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &apigatewaypb.ListGatewaysRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#ListGatewaysRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#ListGatewaysRequest.
 //	}
 //	it := c.ListGateways(ctx, req)
 //	for {
diff --git a/apigateway/go.mod b/apigateway/go.mod
index bf482db07f6..19709087974 100644
--- a/apigateway/go.mod
+++ b/apigateway/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/apigateway
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/apigateway/go.sum b/apigateway/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/apigateway/go.sum
+++ b/apigateway/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/apigeeconnect/aliasshim/aliasshim.go b/apigeeconnect/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/apigeeconnect/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/apigeeconnect/apiv1/apigeeconnectpb/connection.pb.go b/apigeeconnect/apiv1/apigeeconnectpb/connection.pb.go
index 33c6a6ad4e9..5411db56223 100644
--- a/apigeeconnect/apiv1/apigeeconnectpb/connection.pb.go
+++ b/apigeeconnect/apiv1/apigeeconnectpb/connection.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/apigeeconnect/v1/connection.proto
 
 package apigeeconnectpb
diff --git a/apigeeconnect/apiv1/apigeeconnectpb/tether.pb.go b/apigeeconnect/apiv1/apigeeconnectpb/tether.pb.go
index 61fbd7c0e5b..d64c059a600 100644
--- a/apigeeconnect/apiv1/apigeeconnectpb/tether.pb.go
+++ b/apigeeconnect/apiv1/apigeeconnectpb/tether.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/apigeeconnect/v1/tether.proto
 
 package apigeeconnectpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	grpc "google.golang.org/grpc"
@@ -33,6 +32,7 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -215,7 +215,7 @@ type EgressRequest struct {
 	// Unique identifier for clients to trace their request/response.
 	TraceId string `protobuf:"bytes,5,opt,name=trace_id,json=traceId,proto3" json:"trace_id,omitempty"`
 	// Timeout for the HTTP request.
-	Timeout *duration.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
 }
 
 func (x *EgressRequest) Reset() {
@@ -285,7 +285,7 @@ func (x *EgressRequest) GetTraceId() string {
 	return ""
 }
 
-func (x *EgressRequest) GetTimeout() *duration.Duration {
+func (x *EgressRequest) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -1018,19 +1018,19 @@ func file_google_cloud_apigeeconnect_v1_tether_proto_rawDescGZIP() []byte {
 var file_google_cloud_apigeeconnect_v1_tether_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
 var file_google_cloud_apigeeconnect_v1_tether_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_google_cloud_apigeeconnect_v1_tether_proto_goTypes = []interface{}{
-	(Action)(0),               // 0: google.cloud.apigeeconnect.v1.Action
-	(TetherEndpoint)(0),       // 1: google.cloud.apigeeconnect.v1.TetherEndpoint
-	(Scheme)(0),               // 2: google.cloud.apigeeconnect.v1.Scheme
-	(*EgressRequest)(nil),     // 3: google.cloud.apigeeconnect.v1.EgressRequest
-	(*Payload)(nil),           // 4: google.cloud.apigeeconnect.v1.Payload
-	(*StreamInfo)(nil),        // 5: google.cloud.apigeeconnect.v1.StreamInfo
-	(*EgressResponse)(nil),    // 6: google.cloud.apigeeconnect.v1.EgressResponse
-	(*HttpRequest)(nil),       // 7: google.cloud.apigeeconnect.v1.HttpRequest
-	(*Url)(nil),               // 8: google.cloud.apigeeconnect.v1.Url
-	(*Header)(nil),            // 9: google.cloud.apigeeconnect.v1.Header
-	(*HttpResponse)(nil),      // 10: google.cloud.apigeeconnect.v1.HttpResponse
-	(*duration.Duration)(nil), // 11: google.protobuf.Duration
-	(*status.Status)(nil),     // 12: google.rpc.Status
+	(Action)(0),                 // 0: google.cloud.apigeeconnect.v1.Action
+	(TetherEndpoint)(0),         // 1: google.cloud.apigeeconnect.v1.TetherEndpoint
+	(Scheme)(0),                 // 2: google.cloud.apigeeconnect.v1.Scheme
+	(*EgressRequest)(nil),       // 3: google.cloud.apigeeconnect.v1.EgressRequest
+	(*Payload)(nil),             // 4: google.cloud.apigeeconnect.v1.Payload
+	(*StreamInfo)(nil),          // 5: google.cloud.apigeeconnect.v1.StreamInfo
+	(*EgressResponse)(nil),      // 6: google.cloud.apigeeconnect.v1.EgressResponse
+	(*HttpRequest)(nil),         // 7: google.cloud.apigeeconnect.v1.HttpRequest
+	(*Url)(nil),                 // 8: google.cloud.apigeeconnect.v1.Url
+	(*Header)(nil),              // 9: google.cloud.apigeeconnect.v1.Header
+	(*HttpResponse)(nil),        // 10: google.cloud.apigeeconnect.v1.HttpResponse
+	(*durationpb.Duration)(nil), // 11: google.protobuf.Duration
+	(*status.Status)(nil),       // 12: google.rpc.Status
 }
 var file_google_cloud_apigeeconnect_v1_tether_proto_depIdxs = []int32{
 	4,  // 0: google.cloud.apigeeconnect.v1.EgressRequest.payload:type_name -> google.cloud.apigeeconnect.v1.Payload
diff --git a/apigeeconnect/apiv1/connection_client.go b/apigeeconnect/apiv1/connection_client.go
index 17c0e62ab7b..5726b460154 100644
--- a/apigeeconnect/apiv1/connection_client.go
+++ b/apigeeconnect/apiv1/connection_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	apigeeconnectpb "cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	apigeeconnectpb "google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/apigeeconnect/apiv1/connection_client_example_test.go b/apigeeconnect/apiv1/connection_client_example_test.go
index 25a736036f4..6d090333e8b 100644
--- a/apigeeconnect/apiv1/connection_client_example_test.go
+++ b/apigeeconnect/apiv1/connection_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	apigeeconnect "cloud.google.com/go/apigeeconnect/apiv1"
+	apigeeconnectpb "cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb"
 	"google.golang.org/api/iterator"
-	apigeeconnectpb "google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1"
 )
 
 func ExampleNewConnectionClient() {
@@ -56,7 +56,7 @@ func ExampleConnectionClient_ListConnections() {
 
 	req := &apigeeconnectpb.ListConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1#ListConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb#ListConnectionsRequest.
 	}
 	it := c.ListConnections(ctx, req)
 	for {
diff --git a/apigeeconnect/apiv1/doc.go b/apigeeconnect/apiv1/doc.go
index 3d3be378fae..2a50dccc857 100644
--- a/apigeeconnect/apiv1/doc.go
+++ b/apigeeconnect/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &apigeeconnectpb.ListConnectionsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1#ListConnectionsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb#ListConnectionsRequest.
 //	}
 //	it := c.ListConnections(ctx, req)
 //	for {
diff --git a/apigeeconnect/apiv1/tether_client.go b/apigeeconnect/apiv1/tether_client.go
index c644e8b2c77..73ae3c36642 100644
--- a/apigeeconnect/apiv1/tether_client.go
+++ b/apigeeconnect/apiv1/tether_client.go
@@ -20,11 +20,11 @@ import (
 	"context"
 	"math"
 
+	apigeeconnectpb "cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	apigeeconnectpb "google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/apigeeconnect/apiv1/tether_client_example_test.go b/apigeeconnect/apiv1/tether_client_example_test.go
index 0c98681c5a5..ead1726c046 100644
--- a/apigeeconnect/apiv1/tether_client_example_test.go
+++ b/apigeeconnect/apiv1/tether_client_example_test.go
@@ -21,7 +21,7 @@ import (
 	"io"
 
 	apigeeconnect "cloud.google.com/go/apigeeconnect/apiv1"
-	apigeeconnectpb "google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1"
+	apigeeconnectpb "cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb"
 )
 
 func ExampleNewTetherClient() {
diff --git a/apigeeconnect/go.mod b/apigeeconnect/go.mod
index a4cf5cc03b2..12e0dae34c7 100644
--- a/apigeeconnect/go.mod
+++ b/apigeeconnect/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/apigeeconnect
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/apigeeconnect/go.sum b/apigeeconnect/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/apigeeconnect/go.sum
+++ b/apigeeconnect/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/appengine/aliasshim/aliasshim.go b/appengine/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/appengine/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/appengine/apiv1/appenginepb/app_yaml.pb.go b/appengine/apiv1/appenginepb/app_yaml.pb.go
index 9b67ea3b16d..2e65a43c418 100644
--- a/appengine/apiv1/appenginepb/app_yaml.pb.go
+++ b/appengine/apiv1/appenginepb/app_yaml.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/app_yaml.proto
 
 package appenginepb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -680,7 +680,7 @@ type StaticFilesHandler struct {
 	MimeType string `protobuf:"bytes,4,opt,name=mime_type,json=mimeType,proto3" json:"mime_type,omitempty"`
 	// Time a static file served by this handler should be cached
 	// by web proxies and browsers.
-	Expiration *duration.Duration `protobuf:"bytes,5,opt,name=expiration,proto3" json:"expiration,omitempty"`
+	Expiration *durationpb.Duration `protobuf:"bytes,5,opt,name=expiration,proto3" json:"expiration,omitempty"`
 	// Whether this handler should match the request if the file
 	// referenced by the handler does not exist.
 	RequireMatchingFile bool `protobuf:"varint,6,opt,name=require_matching_file,json=requireMatchingFile,proto3" json:"require_matching_file,omitempty"`
@@ -752,7 +752,7 @@ func (x *StaticFilesHandler) GetMimeType() string {
 	return ""
 }
 
-func (x *StaticFilesHandler) GetExpiration() *duration.Duration {
+func (x *StaticFilesHandler) GetExpiration() *durationpb.Duration {
 	if x != nil {
 		return x.Expiration
 	}
@@ -894,9 +894,9 @@ type HealthCheck struct {
 	// restarted.
 	RestartThreshold uint32 `protobuf:"varint,5,opt,name=restart_threshold,json=restartThreshold,proto3" json:"restart_threshold,omitempty"`
 	// Interval between health checks.
-	CheckInterval *duration.Duration `protobuf:"bytes,6,opt,name=check_interval,json=checkInterval,proto3" json:"check_interval,omitempty"`
+	CheckInterval *durationpb.Duration `protobuf:"bytes,6,opt,name=check_interval,json=checkInterval,proto3" json:"check_interval,omitempty"`
 	// Time before the health check is considered failed.
-	Timeout *duration.Duration `protobuf:"bytes,7,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,7,opt,name=timeout,proto3" json:"timeout,omitempty"`
 }
 
 func (x *HealthCheck) Reset() {
@@ -966,14 +966,14 @@ func (x *HealthCheck) GetRestartThreshold() uint32 {
 	return 0
 }
 
-func (x *HealthCheck) GetCheckInterval() *duration.Duration {
+func (x *HealthCheck) GetCheckInterval() *durationpb.Duration {
 	if x != nil {
 		return x.CheckInterval
 	}
 	return nil
 }
 
-func (x *HealthCheck) GetTimeout() *duration.Duration {
+func (x *HealthCheck) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -999,13 +999,13 @@ type ReadinessCheck struct {
 	// traffic.
 	SuccessThreshold uint32 `protobuf:"varint,4,opt,name=success_threshold,json=successThreshold,proto3" json:"success_threshold,omitempty"`
 	// Interval between health checks.
-	CheckInterval *duration.Duration `protobuf:"bytes,5,opt,name=check_interval,json=checkInterval,proto3" json:"check_interval,omitempty"`
+	CheckInterval *durationpb.Duration `protobuf:"bytes,5,opt,name=check_interval,json=checkInterval,proto3" json:"check_interval,omitempty"`
 	// Time before the check is considered failed.
-	Timeout *duration.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// A maximum time limit on application initialization, measured from moment
 	// the application successfully replies to a healthcheck until it is ready to
 	// serve traffic.
-	AppStartTimeout *duration.Duration `protobuf:"bytes,7,opt,name=app_start_timeout,json=appStartTimeout,proto3" json:"app_start_timeout,omitempty"`
+	AppStartTimeout *durationpb.Duration `protobuf:"bytes,7,opt,name=app_start_timeout,json=appStartTimeout,proto3" json:"app_start_timeout,omitempty"`
 }
 
 func (x *ReadinessCheck) Reset() {
@@ -1068,21 +1068,21 @@ func (x *ReadinessCheck) GetSuccessThreshold() uint32 {
 	return 0
 }
 
-func (x *ReadinessCheck) GetCheckInterval() *duration.Duration {
+func (x *ReadinessCheck) GetCheckInterval() *durationpb.Duration {
 	if x != nil {
 		return x.CheckInterval
 	}
 	return nil
 }
 
-func (x *ReadinessCheck) GetTimeout() *duration.Duration {
+func (x *ReadinessCheck) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
 	return nil
 }
 
-func (x *ReadinessCheck) GetAppStartTimeout() *duration.Duration {
+func (x *ReadinessCheck) GetAppStartTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.AppStartTimeout
 	}
@@ -1108,11 +1108,11 @@ type LivenessCheck struct {
 	// the VM healthy.
 	SuccessThreshold uint32 `protobuf:"varint,4,opt,name=success_threshold,json=successThreshold,proto3" json:"success_threshold,omitempty"`
 	// Interval between health checks.
-	CheckInterval *duration.Duration `protobuf:"bytes,5,opt,name=check_interval,json=checkInterval,proto3" json:"check_interval,omitempty"`
+	CheckInterval *durationpb.Duration `protobuf:"bytes,5,opt,name=check_interval,json=checkInterval,proto3" json:"check_interval,omitempty"`
 	// Time before the check is considered failed.
-	Timeout *duration.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// The initial delay before starting to execute the checks.
-	InitialDelay *duration.Duration `protobuf:"bytes,7,opt,name=initial_delay,json=initialDelay,proto3" json:"initial_delay,omitempty"`
+	InitialDelay *durationpb.Duration `protobuf:"bytes,7,opt,name=initial_delay,json=initialDelay,proto3" json:"initial_delay,omitempty"`
 }
 
 func (x *LivenessCheck) Reset() {
@@ -1175,21 +1175,21 @@ func (x *LivenessCheck) GetSuccessThreshold() uint32 {
 	return 0
 }
 
-func (x *LivenessCheck) GetCheckInterval() *duration.Duration {
+func (x *LivenessCheck) GetCheckInterval() *durationpb.Duration {
 	if x != nil {
 		return x.CheckInterval
 	}
 	return nil
 }
 
-func (x *LivenessCheck) GetTimeout() *duration.Duration {
+func (x *LivenessCheck) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
 	return nil
 }
 
-func (x *LivenessCheck) GetInitialDelay() *duration.Duration {
+func (x *LivenessCheck) GetInitialDelay() *durationpb.Duration {
 	if x != nil {
 		return x.InitialDelay
 	}
@@ -1519,7 +1519,7 @@ var file_google_appengine_v1_app_yaml_proto_goTypes = []interface{}{
 	(*LivenessCheck)(nil),                // 13: google.appengine.v1.LivenessCheck
 	(*Library)(nil),                      // 14: google.appengine.v1.Library
 	nil,                                  // 15: google.appengine.v1.StaticFilesHandler.HttpHeadersEntry
-	(*duration.Duration)(nil),            // 16: google.protobuf.Duration
+	(*durationpb.Duration)(nil),          // 16: google.protobuf.Duration
 }
 var file_google_appengine_v1_app_yaml_proto_depIdxs = []int32{
 	0,  // 0: google.appengine.v1.ApiConfigHandler.auth_fail_action:type_name -> google.appengine.v1.AuthFailAction
diff --git a/appengine/apiv1/appenginepb/appengine.pb.go b/appengine/apiv1/appenginepb/appengine.pb.go
index cea8bcd7e1d..7fb7ccee3e5 100644
--- a/appengine/apiv1/appenginepb/appengine.pb.go
+++ b/appengine/apiv1/appenginepb/appengine.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/appengine.proto
 
 package appenginepb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -315,7 +315,7 @@ type UpdateApplicationRequest struct {
 	// An Application containing the updated resource.
 	Application *Application `protobuf:"bytes,2,opt,name=application,proto3" json:"application,omitempty"`
 	// Required. Standard field mask for the set of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateApplicationRequest) Reset() {
@@ -364,7 +364,7 @@ func (x *UpdateApplicationRequest) GetApplication() *Application {
 	return nil
 }
 
-func (x *UpdateApplicationRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateApplicationRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -606,7 +606,7 @@ type UpdateServiceRequest struct {
 	// field mask will be updated.
 	Service *Service `protobuf:"bytes,2,opt,name=service,proto3" json:"service,omitempty"`
 	// Required. Standard field mask for the set of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Set to `true` to gradually shift traffic to one or more versions that you
 	// specify. By default, traffic is shifted immediately.
 	// For gradual traffic migration, the target versions
@@ -668,7 +668,7 @@ func (x *UpdateServiceRequest) GetService() *Service {
 	return nil
 }
 
-func (x *UpdateServiceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateServiceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -997,7 +997,7 @@ type UpdateVersionRequest struct {
 	// mask will be updated.
 	Version *Version `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"`
 	// Standard field mask for the set of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateVersionRequest) Reset() {
@@ -1046,7 +1046,7 @@ func (x *UpdateVersionRequest) GetVersion() *Version {
 	return nil
 }
 
-func (x *UpdateVersionRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateVersionRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1769,7 +1769,7 @@ type UpdateIngressRuleRequest struct {
 	// A FirewallRule containing the updated resource
 	Rule *FirewallRule `protobuf:"bytes,2,opt,name=rule,proto3" json:"rule,omitempty"`
 	// Standard field mask for the set of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateIngressRuleRequest) Reset() {
@@ -1818,7 +1818,7 @@ func (x *UpdateIngressRuleRequest) GetRule() *FirewallRule {
 	return nil
 }
 
-func (x *UpdateIngressRuleRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateIngressRuleRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2265,7 +2265,7 @@ type UpdateAuthorizedCertificateRequest struct {
 	Certificate *AuthorizedCertificate `protobuf:"bytes,2,opt,name=certificate,proto3" json:"certificate,omitempty"`
 	// Standard field mask for the set of fields to be updated. Updates are only
 	// supported on the `certificate_raw_data` and `display_name` fields.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAuthorizedCertificateRequest) Reset() {
@@ -2314,7 +2314,7 @@ func (x *UpdateAuthorizedCertificateRequest) GetCertificate() *AuthorizedCertifi
 	return nil
 }
 
-func (x *UpdateAuthorizedCertificateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAuthorizedCertificateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2627,7 +2627,7 @@ type UpdateDomainMappingRequest struct {
 	// in the field mask will be updated.
 	DomainMapping *DomainMapping `protobuf:"bytes,2,opt,name=domain_mapping,json=domainMapping,proto3" json:"domain_mapping,omitempty"`
 	// Required. Standard field mask for the set of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateDomainMappingRequest) Reset() {
@@ -2676,7 +2676,7 @@ func (x *UpdateDomainMappingRequest) GetDomainMapping() *DomainMapping {
 	return nil
 }
 
-func (x *UpdateDomainMappingRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDomainMappingRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3618,7 +3618,7 @@ var file_google_appengine_v1_appengine_proto_goTypes = []interface{}{
 	(*UpdateDomainMappingRequest)(nil),         // 43: google.appengine.v1.UpdateDomainMappingRequest
 	(*DeleteDomainMappingRequest)(nil),         // 44: google.appengine.v1.DeleteDomainMappingRequest
 	(*Application)(nil),                        // 45: google.appengine.v1.Application
-	(*field_mask.FieldMask)(nil),               // 46: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),              // 46: google.protobuf.FieldMask
 	(*Service)(nil),                            // 47: google.appengine.v1.Service
 	(*Version)(nil),                            // 48: google.appengine.v1.Version
 	(*Instance)(nil),                           // 49: google.appengine.v1.Instance
@@ -3627,7 +3627,7 @@ var file_google_appengine_v1_appengine_proto_goTypes = []interface{}{
 	(*AuthorizedCertificate)(nil),              // 52: google.appengine.v1.AuthorizedCertificate
 	(*DomainMapping)(nil),                      // 53: google.appengine.v1.DomainMapping
 	(*longrunning.Operation)(nil),              // 54: google.longrunning.Operation
-	(*empty.Empty)(nil),                        // 55: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                      // 55: google.protobuf.Empty
 }
 var file_google_appengine_v1_appengine_proto_depIdxs = []int32{
 	45, // 0: google.appengine.v1.CreateApplicationRequest.application:type_name -> google.appengine.v1.Application
@@ -5249,7 +5249,7 @@ type FirewallClient interface {
 	// Updates the specified firewall rule.
 	UpdateIngressRule(ctx context.Context, in *UpdateIngressRuleRequest, opts ...grpc.CallOption) (*FirewallRule, error)
 	// Deletes the specified firewall rule.
-	DeleteIngressRule(ctx context.Context, in *DeleteIngressRuleRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteIngressRule(ctx context.Context, in *DeleteIngressRuleRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type firewallClient struct {
@@ -5305,8 +5305,8 @@ func (c *firewallClient) UpdateIngressRule(ctx context.Context, in *UpdateIngres
 	return out, nil
 }
 
-func (c *firewallClient) DeleteIngressRule(ctx context.Context, in *DeleteIngressRuleRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *firewallClient) DeleteIngressRule(ctx context.Context, in *DeleteIngressRuleRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.appengine.v1.Firewall/DeleteIngressRule", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -5331,7 +5331,7 @@ type FirewallServer interface {
 	// Updates the specified firewall rule.
 	UpdateIngressRule(context.Context, *UpdateIngressRuleRequest) (*FirewallRule, error)
 	// Deletes the specified firewall rule.
-	DeleteIngressRule(context.Context, *DeleteIngressRuleRequest) (*empty.Empty, error)
+	DeleteIngressRule(context.Context, *DeleteIngressRuleRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedFirewallServer can be embedded to have forward compatible implementations.
@@ -5353,7 +5353,7 @@ func (*UnimplementedFirewallServer) GetIngressRule(context.Context, *GetIngressR
 func (*UnimplementedFirewallServer) UpdateIngressRule(context.Context, *UpdateIngressRuleRequest) (*FirewallRule, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateIngressRule not implemented")
 }
-func (*UnimplementedFirewallServer) DeleteIngressRule(context.Context, *DeleteIngressRuleRequest) (*empty.Empty, error) {
+func (*UnimplementedFirewallServer) DeleteIngressRule(context.Context, *DeleteIngressRuleRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteIngressRule not implemented")
 }
 
@@ -5593,7 +5593,7 @@ type AuthorizedCertificatesClient interface {
 	// updated.
 	UpdateAuthorizedCertificate(ctx context.Context, in *UpdateAuthorizedCertificateRequest, opts ...grpc.CallOption) (*AuthorizedCertificate, error)
 	// Deletes the specified SSL certificate.
-	DeleteAuthorizedCertificate(ctx context.Context, in *DeleteAuthorizedCertificateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAuthorizedCertificate(ctx context.Context, in *DeleteAuthorizedCertificateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type authorizedCertificatesClient struct {
@@ -5640,8 +5640,8 @@ func (c *authorizedCertificatesClient) UpdateAuthorizedCertificate(ctx context.C
 	return out, nil
 }
 
-func (c *authorizedCertificatesClient) DeleteAuthorizedCertificate(ctx context.Context, in *DeleteAuthorizedCertificateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *authorizedCertificatesClient) DeleteAuthorizedCertificate(ctx context.Context, in *DeleteAuthorizedCertificateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.appengine.v1.AuthorizedCertificates/DeleteAuthorizedCertificate", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -5664,7 +5664,7 @@ type AuthorizedCertificatesServer interface {
 	// updated.
 	UpdateAuthorizedCertificate(context.Context, *UpdateAuthorizedCertificateRequest) (*AuthorizedCertificate, error)
 	// Deletes the specified SSL certificate.
-	DeleteAuthorizedCertificate(context.Context, *DeleteAuthorizedCertificateRequest) (*empty.Empty, error)
+	DeleteAuthorizedCertificate(context.Context, *DeleteAuthorizedCertificateRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedAuthorizedCertificatesServer can be embedded to have forward compatible implementations.
@@ -5683,7 +5683,7 @@ func (*UnimplementedAuthorizedCertificatesServer) CreateAuthorizedCertificate(co
 func (*UnimplementedAuthorizedCertificatesServer) UpdateAuthorizedCertificate(context.Context, *UpdateAuthorizedCertificateRequest) (*AuthorizedCertificate, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateAuthorizedCertificate not implemented")
 }
-func (*UnimplementedAuthorizedCertificatesServer) DeleteAuthorizedCertificate(context.Context, *DeleteAuthorizedCertificateRequest) (*empty.Empty, error) {
+func (*UnimplementedAuthorizedCertificatesServer) DeleteAuthorizedCertificate(context.Context, *DeleteAuthorizedCertificateRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAuthorizedCertificate not implemented")
 }
 
diff --git a/appengine/apiv1/appenginepb/application.pb.go b/appengine/apiv1/appenginepb/application.pb.go
index 3ef3c4f7d62..cad02abd786 100644
--- a/appengine/apiv1/appenginepb/application.pb.go
+++ b/appengine/apiv1/appenginepb/application.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/application.proto
 
 package appenginepb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -190,7 +190,7 @@ type Application struct {
 	// @OutputOnly
 	CodeBucket string `protobuf:"bytes,8,opt,name=code_bucket,json=codeBucket,proto3" json:"code_bucket,omitempty"`
 	// Cookie expiration policy for this application.
-	DefaultCookieExpiration *duration.Duration `protobuf:"bytes,9,opt,name=default_cookie_expiration,json=defaultCookieExpiration,proto3" json:"default_cookie_expiration,omitempty"`
+	DefaultCookieExpiration *durationpb.Duration `protobuf:"bytes,9,opt,name=default_cookie_expiration,json=defaultCookieExpiration,proto3" json:"default_cookie_expiration,omitempty"`
 	// Serving status of this application.
 	ServingStatus Application_ServingStatus `protobuf:"varint,10,opt,name=serving_status,json=servingStatus,proto3,enum=google.appengine.v1.Application_ServingStatus" json:"serving_status,omitempty"`
 	// Hostname used to reach this application, as resolved by App Engine.
@@ -291,7 +291,7 @@ func (x *Application) GetCodeBucket() string {
 	return ""
 }
 
-func (x *Application) GetDefaultCookieExpiration() *duration.Duration {
+func (x *Application) GetDefaultCookieExpiration() *durationpb.Duration {
 	if x != nil {
 		return x.DefaultCookieExpiration
 	}
@@ -718,7 +718,7 @@ var file_google_appengine_v1_application_proto_goTypes = []interface{}{
 	(*UrlDispatchRule)(nil),                // 3: google.appengine.v1.UrlDispatchRule
 	(*Application_IdentityAwareProxy)(nil), // 4: google.appengine.v1.Application.IdentityAwareProxy
 	(*Application_FeatureSettings)(nil),    // 5: google.appengine.v1.Application.FeatureSettings
-	(*duration.Duration)(nil),              // 6: google.protobuf.Duration
+	(*durationpb.Duration)(nil),            // 6: google.protobuf.Duration
 }
 var file_google_appengine_v1_application_proto_depIdxs = []int32{
 	3, // 0: google.appengine.v1.Application.dispatch_rules:type_name -> google.appengine.v1.UrlDispatchRule
diff --git a/appengine/apiv1/appenginepb/audit_data.pb.go b/appengine/apiv1/appenginepb/audit_data.pb.go
index 2d222dd2b1d..558d5d007c5 100644
--- a/appengine/apiv1/appenginepb/audit_data.pb.go
+++ b/appengine/apiv1/appenginepb/audit_data.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/audit_data.proto
 
 package appenginepb
diff --git a/appengine/apiv1/appenginepb/certificate.pb.go b/appengine/apiv1/appenginepb/certificate.pb.go
index 9542c14c7da..4f73d89627b 100644
--- a/appengine/apiv1/appenginepb/certificate.pb.go
+++ b/appengine/apiv1/appenginepb/certificate.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/certificate.proto
 
 package appenginepb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -149,7 +149,7 @@ type AuthorizedCertificate struct {
 	// using [`AuthorizedCertificates.UpdateAuthorizedCertificate`]().
 	//
 	// @OutputOnly
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// The SSL certificate serving the `AuthorizedCertificate` resource. This
 	// must be obtained independently from a certificate authority.
 	CertificateRawData *CertificateRawData `protobuf:"bytes,6,opt,name=certificate_raw_data,json=certificateRawData,proto3" json:"certificate_raw_data,omitempty"`
@@ -243,7 +243,7 @@ func (x *AuthorizedCertificate) GetDomainNames() []string {
 	return nil
 }
 
-func (x *AuthorizedCertificate) GetExpireTime() *timestamp.Timestamp {
+func (x *AuthorizedCertificate) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -361,7 +361,7 @@ type ManagedCertificate struct {
 	// certificate expires. Renewal errors can be tracked via `ManagementStatus`.
 	//
 	// @OutputOnly
-	LastRenewalTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=last_renewal_time,json=lastRenewalTime,proto3" json:"last_renewal_time,omitempty"`
+	LastRenewalTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=last_renewal_time,json=lastRenewalTime,proto3" json:"last_renewal_time,omitempty"`
 	// Status of certificate management. Refers to the most recent certificate
 	// acquisition or renewal attempt.
 	//
@@ -401,7 +401,7 @@ func (*ManagedCertificate) Descriptor() ([]byte, []int) {
 	return file_google_appengine_v1_certificate_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *ManagedCertificate) GetLastRenewalTime() *timestamp.Timestamp {
+func (x *ManagedCertificate) GetLastRenewalTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastRenewalTime
 	}
@@ -517,7 +517,7 @@ var file_google_appengine_v1_certificate_proto_goTypes = []interface{}{
 	(*AuthorizedCertificate)(nil), // 1: google.appengine.v1.AuthorizedCertificate
 	(*CertificateRawData)(nil),    // 2: google.appengine.v1.CertificateRawData
 	(*ManagedCertificate)(nil),    // 3: google.appengine.v1.ManagedCertificate
-	(*timestamp.Timestamp)(nil),   // 4: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp
 }
 var file_google_appengine_v1_certificate_proto_depIdxs = []int32{
 	4, // 0: google.appengine.v1.AuthorizedCertificate.expire_time:type_name -> google.protobuf.Timestamp
diff --git a/appengine/apiv1/appenginepb/deploy.pb.go b/appengine/apiv1/appenginepb/deploy.pb.go
index 5c35f9f2a26..f9e793f75a5 100644
--- a/appengine/apiv1/appenginepb/deploy.pb.go
+++ b/appengine/apiv1/appenginepb/deploy.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/deploy.proto
 
 package appenginepb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -262,7 +262,7 @@ type CloudBuildOptions struct {
 	AppYamlPath string `protobuf:"bytes,1,opt,name=app_yaml_path,json=appYamlPath,proto3" json:"app_yaml_path,omitempty"`
 	// The Cloud Build timeout used as part of any dependent builds performed by
 	// version creation. Defaults to 10 minutes.
-	CloudBuildTimeout *duration.Duration `protobuf:"bytes,2,opt,name=cloud_build_timeout,json=cloudBuildTimeout,proto3" json:"cloud_build_timeout,omitempty"`
+	CloudBuildTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=cloud_build_timeout,json=cloudBuildTimeout,proto3" json:"cloud_build_timeout,omitempty"`
 }
 
 func (x *CloudBuildOptions) Reset() {
@@ -304,7 +304,7 @@ func (x *CloudBuildOptions) GetAppYamlPath() string {
 	return ""
 }
 
-func (x *CloudBuildOptions) GetCloudBuildTimeout() *duration.Duration {
+func (x *CloudBuildOptions) GetCloudBuildTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.CloudBuildTimeout
 	}
@@ -455,13 +455,13 @@ func file_google_appengine_v1_deploy_proto_rawDescGZIP() []byte {
 
 var file_google_appengine_v1_deploy_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_google_appengine_v1_deploy_proto_goTypes = []interface{}{
-	(*Deployment)(nil),        // 0: google.appengine.v1.Deployment
-	(*FileInfo)(nil),          // 1: google.appengine.v1.FileInfo
-	(*ContainerInfo)(nil),     // 2: google.appengine.v1.ContainerInfo
-	(*CloudBuildOptions)(nil), // 3: google.appengine.v1.CloudBuildOptions
-	(*ZipInfo)(nil),           // 4: google.appengine.v1.ZipInfo
-	nil,                       // 5: google.appengine.v1.Deployment.FilesEntry
-	(*duration.Duration)(nil), // 6: google.protobuf.Duration
+	(*Deployment)(nil),          // 0: google.appengine.v1.Deployment
+	(*FileInfo)(nil),            // 1: google.appengine.v1.FileInfo
+	(*ContainerInfo)(nil),       // 2: google.appengine.v1.ContainerInfo
+	(*CloudBuildOptions)(nil),   // 3: google.appengine.v1.CloudBuildOptions
+	(*ZipInfo)(nil),             // 4: google.appengine.v1.ZipInfo
+	nil,                         // 5: google.appengine.v1.Deployment.FilesEntry
+	(*durationpb.Duration)(nil), // 6: google.protobuf.Duration
 }
 var file_google_appengine_v1_deploy_proto_depIdxs = []int32{
 	5, // 0: google.appengine.v1.Deployment.files:type_name -> google.appengine.v1.Deployment.FilesEntry
diff --git a/appengine/apiv1/appenginepb/deployed_files.pb.go b/appengine/apiv1/appenginepb/deployed_files.pb.go
index 41fc56b2155..3effca1689d 100644
--- a/appengine/apiv1/appenginepb/deployed_files.pb.go
+++ b/appengine/apiv1/appenginepb/deployed_files.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/deployed_files.proto
 
 package appenginepb
diff --git a/appengine/apiv1/appenginepb/domain.pb.go b/appengine/apiv1/appenginepb/domain.pb.go
index a7dd473ac3f..0ec4fc40912 100644
--- a/appengine/apiv1/appenginepb/domain.pb.go
+++ b/appengine/apiv1/appenginepb/domain.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/domain.proto
 
 package appenginepb
diff --git a/appengine/apiv1/appenginepb/domain_mapping.pb.go b/appengine/apiv1/appenginepb/domain_mapping.pb.go
index e1f60a5a16b..50ed91917e8 100644
--- a/appengine/apiv1/appenginepb/domain_mapping.pb.go
+++ b/appengine/apiv1/appenginepb/domain_mapping.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/domain_mapping.proto
 
 package appenginepb
diff --git a/appengine/apiv1/appenginepb/firewall.pb.go b/appengine/apiv1/appenginepb/firewall.pb.go
index 63b97826762..0c78eb962d2 100644
--- a/appengine/apiv1/appenginepb/firewall.pb.go
+++ b/appengine/apiv1/appenginepb/firewall.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/firewall.proto
 
 package appenginepb
diff --git a/appengine/apiv1/appenginepb/instance.pb.go b/appengine/apiv1/appenginepb/instance.pb.go
index 75a10fd9e44..b24615587e1 100644
--- a/appengine/apiv1/appenginepb/instance.pb.go
+++ b/appengine/apiv1/appenginepb/instance.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/instance.proto
 
 package appenginepb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -189,7 +189,7 @@ type Instance struct {
 	// Output only. Time that this instance was started.
 	//
 	// @OutputOnly
-	StartTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. Number of requests since this instance was started.
 	Requests int32 `protobuf:"varint,9,opt,name=requests,proto3" json:"requests,omitempty"`
 	// Output only. Number of errors since this instance was started.
@@ -295,7 +295,7 @@ func (x *Instance) GetVmId() string {
 	return ""
 }
 
-func (x *Instance) GetStartTime() *timestamp.Timestamp {
+func (x *Instance) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -514,7 +514,7 @@ var file_google_appengine_v1_instance_proto_goTypes = []interface{}{
 	(Instance_Liveness_LivenessState)(0), // 1: google.appengine.v1.Instance.Liveness.LivenessState
 	(*Instance)(nil),                     // 2: google.appengine.v1.Instance
 	(*Instance_Liveness)(nil),            // 3: google.appengine.v1.Instance.Liveness
-	(*timestamp.Timestamp)(nil),          // 4: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),        // 4: google.protobuf.Timestamp
 }
 var file_google_appengine_v1_instance_proto_depIdxs = []int32{
 	0, // 0: google.appengine.v1.Instance.availability:type_name -> google.appengine.v1.Instance.Availability
diff --git a/appengine/apiv1/appenginepb/location.pb.go b/appengine/apiv1/appenginepb/location.pb.go
index 655f801eca3..dc295c70587 100644
--- a/appengine/apiv1/appenginepb/location.pb.go
+++ b/appengine/apiv1/appenginepb/location.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/location.proto
 
 package appenginepb
diff --git a/appengine/apiv1/appenginepb/network_settings.pb.go b/appengine/apiv1/appenginepb/network_settings.pb.go
index bcecccff425..54788009544 100644
--- a/appengine/apiv1/appenginepb/network_settings.pb.go
+++ b/appengine/apiv1/appenginepb/network_settings.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/network_settings.proto
 
 package appenginepb
diff --git a/appengine/apiv1/appenginepb/operation.pb.go b/appengine/apiv1/appenginepb/operation.pb.go
index bab84c0f529..a64a111690c 100644
--- a/appengine/apiv1/appenginepb/operation.pb.go
+++ b/appengine/apiv1/appenginepb/operation.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/operation.proto
 
 package appenginepb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -50,11 +50,11 @@ type OperationMetadataV1 struct {
 	// Time that this operation was created.
 	//
 	// @OutputOnly
-	InsertTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=insert_time,json=insertTime,proto3" json:"insert_time,omitempty"`
+	InsertTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=insert_time,json=insertTime,proto3" json:"insert_time,omitempty"`
 	// Time that this operation completed.
 	//
 	// @OutputOnly
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// User who requested this operation.
 	//
 	// @OutputOnly
@@ -118,14 +118,14 @@ func (x *OperationMetadataV1) GetMethod() string {
 	return ""
 }
 
-func (x *OperationMetadataV1) GetInsertTime() *timestamp.Timestamp {
+func (x *OperationMetadataV1) GetInsertTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.InsertTime
 	}
 	return nil
 }
 
-func (x *OperationMetadataV1) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadataV1) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -304,7 +304,7 @@ var file_google_appengine_v1_operation_proto_msgTypes = make([]protoimpl.Message
 var file_google_appengine_v1_operation_proto_goTypes = []interface{}{
 	(*OperationMetadataV1)(nil),     // 0: google.appengine.v1.OperationMetadataV1
 	(*CreateVersionMetadataV1)(nil), // 1: google.appengine.v1.CreateVersionMetadataV1
-	(*timestamp.Timestamp)(nil),     // 2: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),   // 2: google.protobuf.Timestamp
 }
 var file_google_appengine_v1_operation_proto_depIdxs = []int32{
 	2, // 0: google.appengine.v1.OperationMetadataV1.insert_time:type_name -> google.protobuf.Timestamp
diff --git a/appengine/apiv1/appenginepb/service.pb.go b/appengine/apiv1/appenginepb/service.pb.go
index ec81cf60415..3257d7a962e 100644
--- a/appengine/apiv1/appenginepb/service.pb.go
+++ b/appengine/apiv1/appenginepb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/service.proto
 
 package appenginepb
diff --git a/appengine/apiv1/appenginepb/version.pb.go b/appengine/apiv1/appenginepb/version.pb.go
index d292af45e58..5dd1e9175c1 100644
--- a/appengine/apiv1/appenginepb/version.pb.go
+++ b/appengine/apiv1/appenginepb/version.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/appengine/v1/version.proto
 
 package appenginepb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -357,7 +357,7 @@ type Version struct {
 	// Time that this version was created.
 	//
 	// @OutputOnly
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,17,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,17,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Total size in bytes of all the files that are included in this version
 	// and currently hosted on the App Engine disk.
 	//
@@ -407,7 +407,7 @@ type Version struct {
 	// does not specify its own expiration time.
 	//
 	// Only returned in `GET` requests if `view=FULL` is set.
-	DefaultExpiration *duration.Duration `protobuf:"bytes,105,opt,name=default_expiration,json=defaultExpiration,proto3" json:"default_expiration,omitempty"`
+	DefaultExpiration *durationpb.Duration `protobuf:"bytes,105,opt,name=default_expiration,json=defaultExpiration,proto3" json:"default_expiration,omitempty"`
 	// Configures health checking for instances. Unhealthy instances are
 	// stopped and replaced with new instances.
 	// Only applicable in the App Engine flexible environment.
@@ -621,7 +621,7 @@ func (x *Version) GetCreatedBy() string {
 	return ""
 }
 
-func (x *Version) GetCreateTime() *timestamp.Timestamp {
+func (x *Version) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -698,7 +698,7 @@ func (x *Version) GetBuildEnvVariables() map[string]string {
 	return nil
 }
 
-func (x *Version) GetDefaultExpiration() *duration.Duration {
+func (x *Version) GetDefaultExpiration() *durationpb.Duration {
 	if x != nil {
 		return x.DefaultExpiration
 	}
@@ -909,7 +909,7 @@ type AutomaticScaling struct {
 	// This prevents the autoscaler from collecting information when the instance
 	// is initializing, during which the collected usage would not be reliable.
 	// Only applicable in the App Engine flexible environment.
-	CoolDownPeriod *duration.Duration `protobuf:"bytes,1,opt,name=cool_down_period,json=coolDownPeriod,proto3" json:"cool_down_period,omitempty"`
+	CoolDownPeriod *durationpb.Duration `protobuf:"bytes,1,opt,name=cool_down_period,json=coolDownPeriod,proto3" json:"cool_down_period,omitempty"`
 	// Target scaling by CPU usage.
 	CpuUtilization *CpuUtilization `protobuf:"bytes,2,opt,name=cpu_utilization,json=cpuUtilization,proto3" json:"cpu_utilization,omitempty"`
 	// Number of concurrent requests an automatic scaling instance can accept
@@ -925,7 +925,7 @@ type AutomaticScaling struct {
 	MaxTotalInstances int32 `protobuf:"varint,5,opt,name=max_total_instances,json=maxTotalInstances,proto3" json:"max_total_instances,omitempty"`
 	// Maximum amount of time that a request should wait in the pending queue
 	// before starting a new instance to handle it.
-	MaxPendingLatency *duration.Duration `protobuf:"bytes,6,opt,name=max_pending_latency,json=maxPendingLatency,proto3" json:"max_pending_latency,omitempty"`
+	MaxPendingLatency *durationpb.Duration `protobuf:"bytes,6,opt,name=max_pending_latency,json=maxPendingLatency,proto3" json:"max_pending_latency,omitempty"`
 	// Minimum number of idle instances that should be maintained for
 	// this version. Only applicable for the default version of a service.
 	MinIdleInstances int32 `protobuf:"varint,7,opt,name=min_idle_instances,json=minIdleInstances,proto3" json:"min_idle_instances,omitempty"`
@@ -934,7 +934,7 @@ type AutomaticScaling struct {
 	MinTotalInstances int32 `protobuf:"varint,8,opt,name=min_total_instances,json=minTotalInstances,proto3" json:"min_total_instances,omitempty"`
 	// Minimum amount of time a request should wait in the pending queue before
 	// starting a new instance to handle it.
-	MinPendingLatency *duration.Duration `protobuf:"bytes,9,opt,name=min_pending_latency,json=minPendingLatency,proto3" json:"min_pending_latency,omitempty"`
+	MinPendingLatency *durationpb.Duration `protobuf:"bytes,9,opt,name=min_pending_latency,json=minPendingLatency,proto3" json:"min_pending_latency,omitempty"`
 	// Target scaling by request utilization.
 	RequestUtilization *RequestUtilization `protobuf:"bytes,10,opt,name=request_utilization,json=requestUtilization,proto3" json:"request_utilization,omitempty"`
 	// Target scaling by disk usage.
@@ -977,7 +977,7 @@ func (*AutomaticScaling) Descriptor() ([]byte, []int) {
 	return file_google_appengine_v1_version_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *AutomaticScaling) GetCoolDownPeriod() *duration.Duration {
+func (x *AutomaticScaling) GetCoolDownPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.CoolDownPeriod
 	}
@@ -1012,7 +1012,7 @@ func (x *AutomaticScaling) GetMaxTotalInstances() int32 {
 	return 0
 }
 
-func (x *AutomaticScaling) GetMaxPendingLatency() *duration.Duration {
+func (x *AutomaticScaling) GetMaxPendingLatency() *durationpb.Duration {
 	if x != nil {
 		return x.MaxPendingLatency
 	}
@@ -1033,7 +1033,7 @@ func (x *AutomaticScaling) GetMinTotalInstances() int32 {
 	return 0
 }
 
-func (x *AutomaticScaling) GetMinPendingLatency() *duration.Duration {
+func (x *AutomaticScaling) GetMinPendingLatency() *durationpb.Duration {
 	if x != nil {
 		return x.MinPendingLatency
 	}
@@ -1079,7 +1079,7 @@ type BasicScaling struct {
 
 	// Duration of time after the last request that an instance must wait before
 	// the instance is shut down.
-	IdleTimeout *duration.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"`
+	IdleTimeout *durationpb.Duration `protobuf:"bytes,1,opt,name=idle_timeout,json=idleTimeout,proto3" json:"idle_timeout,omitempty"`
 	// Maximum number of instances to create for this version.
 	MaxInstances int32 `protobuf:"varint,2,opt,name=max_instances,json=maxInstances,proto3" json:"max_instances,omitempty"`
 }
@@ -1116,7 +1116,7 @@ func (*BasicScaling) Descriptor() ([]byte, []int) {
 	return file_google_appengine_v1_version_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *BasicScaling) GetIdleTimeout() *duration.Duration {
+func (x *BasicScaling) GetIdleTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.IdleTimeout
 	}
@@ -1190,7 +1190,7 @@ type CpuUtilization struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Period of time over which CPU utilization is calculated.
-	AggregationWindowLength *duration.Duration `protobuf:"bytes,1,opt,name=aggregation_window_length,json=aggregationWindowLength,proto3" json:"aggregation_window_length,omitempty"`
+	AggregationWindowLength *durationpb.Duration `protobuf:"bytes,1,opt,name=aggregation_window_length,json=aggregationWindowLength,proto3" json:"aggregation_window_length,omitempty"`
 	// Target CPU utilization ratio to maintain when scaling. Must be between 0
 	// and 1.
 	TargetUtilization float64 `protobuf:"fixed64,2,opt,name=target_utilization,json=targetUtilization,proto3" json:"target_utilization,omitempty"`
@@ -1228,7 +1228,7 @@ func (*CpuUtilization) Descriptor() ([]byte, []int) {
 	return file_google_appengine_v1_version_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *CpuUtilization) GetAggregationWindowLength() *duration.Duration {
+func (x *CpuUtilization) GetAggregationWindowLength() *durationpb.Duration {
 	if x != nil {
 		return x.AggregationWindowLength
 	}
@@ -2380,12 +2380,12 @@ var file_google_appengine_v1_version_proto_goTypes = []interface{}{
 	nil,                                      // 19: google.appengine.v1.Version.BetaSettingsEntry
 	nil,                                      // 20: google.appengine.v1.Version.EnvVariablesEntry
 	nil,                                      // 21: google.appengine.v1.Version.BuildEnvVariablesEntry
-	(*timestamp.Timestamp)(nil),              // 22: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),            // 22: google.protobuf.Timestamp
 	(*UrlMap)(nil),                           // 23: google.appengine.v1.UrlMap
 	(*ErrorHandler)(nil),                     // 24: google.appengine.v1.ErrorHandler
 	(*Library)(nil),                          // 25: google.appengine.v1.Library
 	(*ApiConfigHandler)(nil),                 // 26: google.appengine.v1.ApiConfigHandler
-	(*duration.Duration)(nil),                // 27: google.protobuf.Duration
+	(*durationpb.Duration)(nil),              // 27: google.protobuf.Duration
 	(*HealthCheck)(nil),                      // 28: google.appengine.v1.HealthCheck
 	(*ReadinessCheck)(nil),                   // 29: google.appengine.v1.ReadinessCheck
 	(*LivenessCheck)(nil),                    // 30: google.appengine.v1.LivenessCheck
diff --git a/appengine/apiv1/applications_client.go b/appengine/apiv1/applications_client.go
index 2bfe97673eb..6bbb3c65bfb 100644
--- a/appengine/apiv1/applications_client.go
+++ b/appengine/apiv1/applications_client.go
@@ -23,13 +23,13 @@ import (
 	"net/url"
 	"time"
 
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/appengine/apiv1/applications_client_example_test.go b/appengine/apiv1/applications_client_example_test.go
index 72c6a6f8567..f6085640847 100644
--- a/appengine/apiv1/applications_client_example_test.go
+++ b/appengine/apiv1/applications_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func ExampleNewApplicationsClient() {
@@ -55,7 +55,7 @@ func ExampleApplicationsClient_GetApplication() {
 
 	req := &appenginepb.GetApplicationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetApplicationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetApplicationRequest.
 	}
 	resp, err := c.GetApplication(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleApplicationsClient_CreateApplication() {
 
 	req := &appenginepb.CreateApplicationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateApplicationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateApplicationRequest.
 	}
 	op, err := c.CreateApplication(ctx, req)
 	if err != nil {
@@ -110,7 +110,7 @@ func ExampleApplicationsClient_UpdateApplication() {
 
 	req := &appenginepb.UpdateApplicationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateApplicationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateApplicationRequest.
 	}
 	op, err := c.UpdateApplication(ctx, req)
 	if err != nil {
@@ -140,7 +140,7 @@ func ExampleApplicationsClient_RepairApplication() {
 
 	req := &appenginepb.RepairApplicationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#RepairApplicationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#RepairApplicationRequest.
 	}
 	op, err := c.RepairApplication(ctx, req)
 	if err != nil {
diff --git a/appengine/apiv1/authorized_certificates_client.go b/appengine/apiv1/authorized_certificates_client.go
index dd92b612c9d..bd3abbd1836 100644
--- a/appengine/apiv1/authorized_certificates_client.go
+++ b/appengine/apiv1/authorized_certificates_client.go
@@ -22,12 +22,12 @@ import (
 	"math"
 	"net/url"
 
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/appengine/apiv1/authorized_certificates_client_example_test.go b/appengine/apiv1/authorized_certificates_client_example_test.go
index d669ecee918..da97ce2a0c0 100644
--- a/appengine/apiv1/authorized_certificates_client_example_test.go
+++ b/appengine/apiv1/authorized_certificates_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func ExampleNewAuthorizedCertificatesClient() {
@@ -56,7 +56,7 @@ func ExampleAuthorizedCertificatesClient_ListAuthorizedCertificates() {
 
 	req := &appenginepb.ListAuthorizedCertificatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListAuthorizedCertificatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListAuthorizedCertificatesRequest.
 	}
 	it := c.ListAuthorizedCertificates(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleAuthorizedCertificatesClient_GetAuthorizedCertificate() {
 
 	req := &appenginepb.GetAuthorizedCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetAuthorizedCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetAuthorizedCertificateRequest.
 	}
 	resp, err := c.GetAuthorizedCertificate(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleAuthorizedCertificatesClient_CreateAuthorizedCertificate() {
 
 	req := &appenginepb.CreateAuthorizedCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateAuthorizedCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateAuthorizedCertificateRequest.
 	}
 	resp, err := c.CreateAuthorizedCertificate(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleAuthorizedCertificatesClient_UpdateAuthorizedCertificate() {
 
 	req := &appenginepb.UpdateAuthorizedCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateAuthorizedCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateAuthorizedCertificateRequest.
 	}
 	resp, err := c.UpdateAuthorizedCertificate(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleAuthorizedCertificatesClient_DeleteAuthorizedCertificate() {
 
 	req := &appenginepb.DeleteAuthorizedCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteAuthorizedCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteAuthorizedCertificateRequest.
 	}
 	err = c.DeleteAuthorizedCertificate(ctx, req)
 	if err != nil {
diff --git a/appengine/apiv1/authorized_domains_client.go b/appengine/apiv1/authorized_domains_client.go
index 3f900f7e340..031ac932c61 100644
--- a/appengine/apiv1/authorized_domains_client.go
+++ b/appengine/apiv1/authorized_domains_client.go
@@ -22,12 +22,12 @@ import (
 	"math"
 	"net/url"
 
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/appengine/apiv1/authorized_domains_client_example_test.go b/appengine/apiv1/authorized_domains_client_example_test.go
index 79ece0c98eb..7bfec02db53 100644
--- a/appengine/apiv1/authorized_domains_client_example_test.go
+++ b/appengine/apiv1/authorized_domains_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func ExampleNewAuthorizedDomainsClient() {
@@ -56,7 +56,7 @@ func ExampleAuthorizedDomainsClient_ListAuthorizedDomains() {
 
 	req := &appenginepb.ListAuthorizedDomainsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListAuthorizedDomainsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListAuthorizedDomainsRequest.
 	}
 	it := c.ListAuthorizedDomains(ctx, req)
 	for {
diff --git a/appengine/apiv1/doc.go b/appengine/apiv1/doc.go
index 823aa0917e4..6daae70f2bd 100644
--- a/appengine/apiv1/doc.go
+++ b/appengine/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &appenginepb.GetApplicationRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetApplicationRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetApplicationRequest.
 //	}
 //	resp, err := c.GetApplication(ctx, req)
 //	if err != nil {
diff --git a/appengine/apiv1/domain_mappings_client.go b/appengine/apiv1/domain_mappings_client.go
index 6b7d377c457..b5c8ec15005 100644
--- a/appengine/apiv1/domain_mappings_client.go
+++ b/appengine/apiv1/domain_mappings_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/appengine/apiv1/domain_mappings_client_example_test.go b/appengine/apiv1/domain_mappings_client_example_test.go
index 3022a344c9f..a357f7a05d8 100644
--- a/appengine/apiv1/domain_mappings_client_example_test.go
+++ b/appengine/apiv1/domain_mappings_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func ExampleNewDomainMappingsClient() {
@@ -56,7 +56,7 @@ func ExampleDomainMappingsClient_ListDomainMappings() {
 
 	req := &appenginepb.ListDomainMappingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListDomainMappingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListDomainMappingsRequest.
 	}
 	it := c.ListDomainMappings(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleDomainMappingsClient_GetDomainMapping() {
 
 	req := &appenginepb.GetDomainMappingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetDomainMappingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetDomainMappingRequest.
 	}
 	resp, err := c.GetDomainMapping(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleDomainMappingsClient_CreateDomainMapping() {
 
 	req := &appenginepb.CreateDomainMappingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateDomainMappingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateDomainMappingRequest.
 	}
 	op, err := c.CreateDomainMapping(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleDomainMappingsClient_UpdateDomainMapping() {
 
 	req := &appenginepb.UpdateDomainMappingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateDomainMappingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateDomainMappingRequest.
 	}
 	op, err := c.UpdateDomainMapping(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleDomainMappingsClient_DeleteDomainMapping() {
 
 	req := &appenginepb.DeleteDomainMappingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteDomainMappingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteDomainMappingRequest.
 	}
 	op, err := c.DeleteDomainMapping(ctx, req)
 	if err != nil {
diff --git a/appengine/apiv1/firewall_client.go b/appengine/apiv1/firewall_client.go
index a0513318306..d6ab31507d6 100644
--- a/appengine/apiv1/firewall_client.go
+++ b/appengine/apiv1/firewall_client.go
@@ -22,12 +22,12 @@ import (
 	"math"
 	"net/url"
 
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/appengine/apiv1/firewall_client_example_test.go b/appengine/apiv1/firewall_client_example_test.go
index 6fdc07b78ea..b593015e4e8 100644
--- a/appengine/apiv1/firewall_client_example_test.go
+++ b/appengine/apiv1/firewall_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func ExampleNewFirewallClient() {
@@ -56,7 +56,7 @@ func ExampleFirewallClient_ListIngressRules() {
 
 	req := &appenginepb.ListIngressRulesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListIngressRulesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListIngressRulesRequest.
 	}
 	it := c.ListIngressRules(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleFirewallClient_BatchUpdateIngressRules() {
 
 	req := &appenginepb.BatchUpdateIngressRulesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#BatchUpdateIngressRulesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#BatchUpdateIngressRulesRequest.
 	}
 	resp, err := c.BatchUpdateIngressRules(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleFirewallClient_CreateIngressRule() {
 
 	req := &appenginepb.CreateIngressRuleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateIngressRuleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateIngressRuleRequest.
 	}
 	resp, err := c.CreateIngressRule(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleFirewallClient_GetIngressRule() {
 
 	req := &appenginepb.GetIngressRuleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetIngressRuleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetIngressRuleRequest.
 	}
 	resp, err := c.GetIngressRule(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleFirewallClient_UpdateIngressRule() {
 
 	req := &appenginepb.UpdateIngressRuleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateIngressRuleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateIngressRuleRequest.
 	}
 	resp, err := c.UpdateIngressRule(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleFirewallClient_DeleteIngressRule() {
 
 	req := &appenginepb.DeleteIngressRuleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteIngressRuleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteIngressRuleRequest.
 	}
 	err = c.DeleteIngressRule(ctx, req)
 	if err != nil {
diff --git a/appengine/apiv1/instances_client.go b/appengine/apiv1/instances_client.go
index 79a4e708c04..b25f9396a89 100644
--- a/appengine/apiv1/instances_client.go
+++ b/appengine/apiv1/instances_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/appengine/apiv1/instances_client_example_test.go b/appengine/apiv1/instances_client_example_test.go
index 6a40e142774..52b11d28f00 100644
--- a/appengine/apiv1/instances_client_example_test.go
+++ b/appengine/apiv1/instances_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func ExampleNewInstancesClient() {
@@ -56,7 +56,7 @@ func ExampleInstancesClient_ListInstances() {
 
 	req := &appenginepb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleInstancesClient_GetInstance() {
 
 	req := &appenginepb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleInstancesClient_DeleteInstance() {
 
 	req := &appenginepb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
@@ -140,7 +140,7 @@ func ExampleInstancesClient_DebugInstance() {
 
 	req := &appenginepb.DebugInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DebugInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DebugInstanceRequest.
 	}
 	op, err := c.DebugInstance(ctx, req)
 	if err != nil {
diff --git a/appengine/apiv1/services_client.go b/appengine/apiv1/services_client.go
index 85f298e1fe6..d614b3cf7db 100644
--- a/appengine/apiv1/services_client.go
+++ b/appengine/apiv1/services_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/appengine/apiv1/services_client_example_test.go b/appengine/apiv1/services_client_example_test.go
index c45f1c58f1f..3fead76ee94 100644
--- a/appengine/apiv1/services_client_example_test.go
+++ b/appengine/apiv1/services_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func ExampleNewServicesClient() {
@@ -56,7 +56,7 @@ func ExampleServicesClient_ListServices() {
 
 	req := &appenginepb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleServicesClient_GetService() {
 
 	req := &appenginepb.GetServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetServiceRequest.
 	}
 	resp, err := c.GetService(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleServicesClient_UpdateService() {
 
 	req := &appenginepb.UpdateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateServiceRequest.
 	}
 	op, err := c.UpdateService(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleServicesClient_DeleteService() {
 
 	req := &appenginepb.DeleteServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteServiceRequest.
 	}
 	op, err := c.DeleteService(ctx, req)
 	if err != nil {
diff --git a/appengine/apiv1/versions_client.go b/appengine/apiv1/versions_client.go
index 34aee811a04..1f647b8084b 100644
--- a/appengine/apiv1/versions_client.go
+++ b/appengine/apiv1/versions_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/appengine/apiv1/versions_client_example_test.go b/appengine/apiv1/versions_client_example_test.go
index e5bb80ebcf7..d011384373a 100644
--- a/appengine/apiv1/versions_client_example_test.go
+++ b/appengine/apiv1/versions_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func ExampleNewVersionsClient() {
@@ -56,7 +56,7 @@ func ExampleVersionsClient_ListVersions() {
 
 	req := &appenginepb.ListVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListVersionsRequest.
 	}
 	it := c.ListVersions(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleVersionsClient_GetVersion() {
 
 	req := &appenginepb.GetVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetVersionRequest.
 	}
 	resp, err := c.GetVersion(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleVersionsClient_CreateVersion() {
 
 	req := &appenginepb.CreateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateVersionRequest.
 	}
 	op, err := c.CreateVersion(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleVersionsClient_UpdateVersion() {
 
 	req := &appenginepb.UpdateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateVersionRequest.
 	}
 	op, err := c.UpdateVersion(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleVersionsClient_DeleteVersion() {
 
 	req := &appenginepb.DeleteVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteVersionRequest.
 	}
 	op, err := c.DeleteVersion(ctx, req)
 	if err != nil {
diff --git a/appengine/go.mod b/appengine/go.mod
index 94cd7333491..12a9f9218e4 100644
--- a/appengine/go.mod
+++ b/appengine/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/appengine
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/appengine/go.sum b/appengine/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/appengine/go.sum
+++ b/appengine/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/artifactregistry/apiv1/artifact_registry_client.go b/artifactregistry/apiv1/artifact_registry_client.go
index 108d79ef296..58fad80046b 100644
--- a/artifactregistry/apiv1/artifact_registry_client.go
+++ b/artifactregistry/apiv1/artifact_registry_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/artifactregistry/apiv1/artifact_registry_client_example_test.go b/artifactregistry/apiv1/artifact_registry_client_example_test.go
index 87245887e43..5443a4927ac 100644
--- a/artifactregistry/apiv1/artifact_registry_client_example_test.go
+++ b/artifactregistry/apiv1/artifact_registry_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 	"google.golang.org/api/iterator"
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleClient_ListDockerImages() {
 
 	req := &artifactregistrypb.ListDockerImagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListDockerImagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListDockerImagesRequest.
 	}
 	it := c.ListDockerImages(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleClient_GetDockerImage() {
 
 	req := &artifactregistrypb.GetDockerImageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetDockerImageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetDockerImageRequest.
 	}
 	resp, err := c.GetDockerImage(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleClient_ImportAptArtifacts() {
 
 	req := &artifactregistrypb.ImportAptArtifactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ImportAptArtifactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ImportAptArtifactsRequest.
 	}
 	op, err := c.ImportAptArtifacts(ctx, req)
 	if err != nil {
@@ -143,7 +143,7 @@ func ExampleClient_ImportYumArtifacts() {
 
 	req := &artifactregistrypb.ImportYumArtifactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ImportYumArtifactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ImportYumArtifactsRequest.
 	}
 	op, err := c.ImportYumArtifacts(ctx, req)
 	if err != nil {
@@ -173,7 +173,7 @@ func ExampleClient_ListRepositories() {
 
 	req := &artifactregistrypb.ListRepositoriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListRepositoriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListRepositoriesRequest.
 	}
 	it := c.ListRepositories(ctx, req)
 	for {
@@ -204,7 +204,7 @@ func ExampleClient_GetRepository() {
 
 	req := &artifactregistrypb.GetRepositoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetRepositoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetRepositoryRequest.
 	}
 	resp, err := c.GetRepository(ctx, req)
 	if err != nil {
@@ -229,7 +229,7 @@ func ExampleClient_CreateRepository() {
 
 	req := &artifactregistrypb.CreateRepositoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#CreateRepositoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#CreateRepositoryRequest.
 	}
 	op, err := c.CreateRepository(ctx, req)
 	if err != nil {
@@ -259,7 +259,7 @@ func ExampleClient_UpdateRepository() {
 
 	req := &artifactregistrypb.UpdateRepositoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#UpdateRepositoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#UpdateRepositoryRequest.
 	}
 	resp, err := c.UpdateRepository(ctx, req)
 	if err != nil {
@@ -284,7 +284,7 @@ func ExampleClient_DeleteRepository() {
 
 	req := &artifactregistrypb.DeleteRepositoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#DeleteRepositoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#DeleteRepositoryRequest.
 	}
 	op, err := c.DeleteRepository(ctx, req)
 	if err != nil {
@@ -312,7 +312,7 @@ func ExampleClient_ListPackages() {
 
 	req := &artifactregistrypb.ListPackagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListPackagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListPackagesRequest.
 	}
 	it := c.ListPackages(ctx, req)
 	for {
@@ -343,7 +343,7 @@ func ExampleClient_GetPackage() {
 
 	req := &artifactregistrypb.GetPackageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetPackageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetPackageRequest.
 	}
 	resp, err := c.GetPackage(ctx, req)
 	if err != nil {
@@ -368,7 +368,7 @@ func ExampleClient_DeletePackage() {
 
 	req := &artifactregistrypb.DeletePackageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#DeletePackageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#DeletePackageRequest.
 	}
 	op, err := c.DeletePackage(ctx, req)
 	if err != nil {
@@ -396,7 +396,7 @@ func ExampleClient_ListVersions() {
 
 	req := &artifactregistrypb.ListVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListVersionsRequest.
 	}
 	it := c.ListVersions(ctx, req)
 	for {
@@ -427,7 +427,7 @@ func ExampleClient_GetVersion() {
 
 	req := &artifactregistrypb.GetVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetVersionRequest.
 	}
 	resp, err := c.GetVersion(ctx, req)
 	if err != nil {
@@ -452,7 +452,7 @@ func ExampleClient_DeleteVersion() {
 
 	req := &artifactregistrypb.DeleteVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#DeleteVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#DeleteVersionRequest.
 	}
 	op, err := c.DeleteVersion(ctx, req)
 	if err != nil {
@@ -480,7 +480,7 @@ func ExampleClient_ListFiles() {
 
 	req := &artifactregistrypb.ListFilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListFilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListFilesRequest.
 	}
 	it := c.ListFiles(ctx, req)
 	for {
@@ -511,7 +511,7 @@ func ExampleClient_GetFile() {
 
 	req := &artifactregistrypb.GetFileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetFileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetFileRequest.
 	}
 	resp, err := c.GetFile(ctx, req)
 	if err != nil {
@@ -536,7 +536,7 @@ func ExampleClient_ListTags() {
 
 	req := &artifactregistrypb.ListTagsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListTagsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListTagsRequest.
 	}
 	it := c.ListTags(ctx, req)
 	for {
@@ -567,7 +567,7 @@ func ExampleClient_GetTag() {
 
 	req := &artifactregistrypb.GetTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetTagRequest.
 	}
 	resp, err := c.GetTag(ctx, req)
 	if err != nil {
@@ -592,7 +592,7 @@ func ExampleClient_CreateTag() {
 
 	req := &artifactregistrypb.CreateTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#CreateTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#CreateTagRequest.
 	}
 	resp, err := c.CreateTag(ctx, req)
 	if err != nil {
@@ -617,7 +617,7 @@ func ExampleClient_UpdateTag() {
 
 	req := &artifactregistrypb.UpdateTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#UpdateTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#UpdateTagRequest.
 	}
 	resp, err := c.UpdateTag(ctx, req)
 	if err != nil {
@@ -642,7 +642,7 @@ func ExampleClient_DeleteTag() {
 
 	req := &artifactregistrypb.DeleteTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#DeleteTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#DeleteTagRequest.
 	}
 	err = c.DeleteTag(ctx, req)
 	if err != nil {
@@ -740,7 +740,7 @@ func ExampleClient_GetProjectSettings() {
 
 	req := &artifactregistrypb.GetProjectSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetProjectSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetProjectSettingsRequest.
 	}
 	resp, err := c.GetProjectSettings(ctx, req)
 	if err != nil {
@@ -765,7 +765,7 @@ func ExampleClient_UpdateProjectSettings() {
 
 	req := &artifactregistrypb.UpdateProjectSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#UpdateProjectSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#UpdateProjectSettingsRequest.
 	}
 	resp, err := c.UpdateProjectSettings(ctx, req)
 	if err != nil {
diff --git a/artifactregistry/apiv1/artifactregistrypb/apt_artifact.pb.go b/artifactregistry/apiv1/artifactregistrypb/apt_artifact.pb.go
index ba0fa030f01..d4543664854 100644
--- a/artifactregistry/apiv1/artifactregistrypb/apt_artifact.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/apt_artifact.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/apt_artifact.proto
 
 package artifactregistrypb
diff --git a/artifactregistry/apiv1/artifactregistrypb/artifact.pb.go b/artifactregistry/apiv1/artifactregistrypb/artifact.pb.go
index 9754011d3f6..b32ed61ce21 100644
--- a/artifactregistry/apiv1/artifactregistrypb/artifact.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/artifact.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/artifact.proto
 
 package artifactregistrypb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -70,7 +70,7 @@ type DockerImage struct {
 	// Version resource.
 	ImageSizeBytes int64 `protobuf:"varint,4,opt,name=image_size_bytes,json=imageSizeBytes,proto3" json:"image_size_bytes,omitempty"`
 	// Time the image was uploaded.
-	UploadTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=upload_time,json=uploadTime,proto3" json:"upload_time,omitempty"`
+	UploadTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=upload_time,json=uploadTime,proto3" json:"upload_time,omitempty"`
 	// Media type of this image, e.g.
 	// "application/vnd.docker.distribution.manifest.v2+json".
 	// This field is returned as the 'metadata.mediaType' field in the
@@ -81,7 +81,7 @@ type DockerImage struct {
 	// Version resource.
 	// The build time is returned to the client as an RFC 3339 string, which can
 	// be easily used with the JavaScript Date constructor.
-	BuildTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=build_time,json=buildTime,proto3" json:"build_time,omitempty"`
+	BuildTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=build_time,json=buildTime,proto3" json:"build_time,omitempty"`
 }
 
 func (x *DockerImage) Reset() {
@@ -144,7 +144,7 @@ func (x *DockerImage) GetImageSizeBytes() int64 {
 	return 0
 }
 
-func (x *DockerImage) GetUploadTime() *timestamp.Timestamp {
+func (x *DockerImage) GetUploadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UploadTime
 	}
@@ -158,7 +158,7 @@ func (x *DockerImage) GetMediaType() string {
 	return ""
 }
 
-func (x *DockerImage) GetBuildTime() *timestamp.Timestamp {
+func (x *DockerImage) GetBuildTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.BuildTime
 	}
@@ -441,7 +441,7 @@ var file_google_devtools_artifactregistry_v1_artifact_proto_goTypes = []interfac
 	(*ListDockerImagesRequest)(nil),  // 1: google.devtools.artifactregistry.v1.ListDockerImagesRequest
 	(*ListDockerImagesResponse)(nil), // 2: google.devtools.artifactregistry.v1.ListDockerImagesResponse
 	(*GetDockerImageRequest)(nil),    // 3: google.devtools.artifactregistry.v1.GetDockerImageRequest
-	(*timestamp.Timestamp)(nil),      // 4: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),    // 4: google.protobuf.Timestamp
 }
 var file_google_devtools_artifactregistry_v1_artifact_proto_depIdxs = []int32{
 	4, // 0: google.devtools.artifactregistry.v1.DockerImage.upload_time:type_name -> google.protobuf.Timestamp
diff --git a/artifactregistry/apiv1/artifactregistrypb/file.pb.go b/artifactregistry/apiv1/artifactregistrypb/file.pb.go
index 3e5b4ddb281..bc077cb7a9d 100644
--- a/artifactregistry/apiv1/artifactregistrypb/file.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/file.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/file.proto
 
 package artifactregistrypb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -163,9 +163,9 @@ type File struct {
 	// The hashes of the file content.
 	Hashes []*Hash `protobuf:"bytes,4,rep,name=hashes,proto3" json:"hashes,omitempty"`
 	// The time when the File was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time when the File was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The name of the Package or Version that owns this file, if any.
 	Owner string `protobuf:"bytes,7,opt,name=owner,proto3" json:"owner,omitempty"`
 }
@@ -223,14 +223,14 @@ func (x *File) GetHashes() []*Hash {
 	return nil
 }
 
-func (x *File) GetCreateTime() *timestamp.Timestamp {
+func (x *File) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *File) GetUpdateTime() *timestamp.Timestamp {
+func (x *File) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -551,13 +551,13 @@ func file_google_devtools_artifactregistry_v1_file_proto_rawDescGZIP() []byte {
 var file_google_devtools_artifactregistry_v1_file_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_devtools_artifactregistry_v1_file_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_google_devtools_artifactregistry_v1_file_proto_goTypes = []interface{}{
-	(Hash_HashType)(0),          // 0: google.devtools.artifactregistry.v1.Hash.HashType
-	(*Hash)(nil),                // 1: google.devtools.artifactregistry.v1.Hash
-	(*File)(nil),                // 2: google.devtools.artifactregistry.v1.File
-	(*ListFilesRequest)(nil),    // 3: google.devtools.artifactregistry.v1.ListFilesRequest
-	(*ListFilesResponse)(nil),   // 4: google.devtools.artifactregistry.v1.ListFilesResponse
-	(*GetFileRequest)(nil),      // 5: google.devtools.artifactregistry.v1.GetFileRequest
-	(*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp
+	(Hash_HashType)(0),            // 0: google.devtools.artifactregistry.v1.Hash.HashType
+	(*Hash)(nil),                  // 1: google.devtools.artifactregistry.v1.Hash
+	(*File)(nil),                  // 2: google.devtools.artifactregistry.v1.File
+	(*ListFilesRequest)(nil),      // 3: google.devtools.artifactregistry.v1.ListFilesRequest
+	(*ListFilesResponse)(nil),     // 4: google.devtools.artifactregistry.v1.ListFilesResponse
+	(*GetFileRequest)(nil),        // 5: google.devtools.artifactregistry.v1.GetFileRequest
+	(*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp
 }
 var file_google_devtools_artifactregistry_v1_file_proto_depIdxs = []int32{
 	0, // 0: google.devtools.artifactregistry.v1.Hash.type:type_name -> google.devtools.artifactregistry.v1.Hash.HashType
diff --git a/artifactregistry/apiv1/artifactregistrypb/package.pb.go b/artifactregistry/apiv1/artifactregistrypb/package.pb.go
index 841d3286a0b..3fb4fd106bd 100644
--- a/artifactregistry/apiv1/artifactregistrypb/package.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/package.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/package.proto
 
 package artifactregistrypb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -50,10 +50,10 @@ type Package struct {
 	// The display name of the package.
 	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// The time when the package was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time when the package was last updated. This includes publishing a new
 	// version of the package.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Package) Reset() {
@@ -102,14 +102,14 @@ func (x *Package) GetDisplayName() string {
 	return ""
 }
 
-func (x *Package) GetCreateTime() *timestamp.Timestamp {
+func (x *Package) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Package) GetUpdateTime() *timestamp.Timestamp {
+func (x *Package) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -419,12 +419,12 @@ func file_google_devtools_artifactregistry_v1_package_proto_rawDescGZIP() []byte
 
 var file_google_devtools_artifactregistry_v1_package_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_google_devtools_artifactregistry_v1_package_proto_goTypes = []interface{}{
-	(*Package)(nil),              // 0: google.devtools.artifactregistry.v1.Package
-	(*ListPackagesRequest)(nil),  // 1: google.devtools.artifactregistry.v1.ListPackagesRequest
-	(*ListPackagesResponse)(nil), // 2: google.devtools.artifactregistry.v1.ListPackagesResponse
-	(*GetPackageRequest)(nil),    // 3: google.devtools.artifactregistry.v1.GetPackageRequest
-	(*DeletePackageRequest)(nil), // 4: google.devtools.artifactregistry.v1.DeletePackageRequest
-	(*timestamp.Timestamp)(nil),  // 5: google.protobuf.Timestamp
+	(*Package)(nil),               // 0: google.devtools.artifactregistry.v1.Package
+	(*ListPackagesRequest)(nil),   // 1: google.devtools.artifactregistry.v1.ListPackagesRequest
+	(*ListPackagesResponse)(nil),  // 2: google.devtools.artifactregistry.v1.ListPackagesResponse
+	(*GetPackageRequest)(nil),     // 3: google.devtools.artifactregistry.v1.GetPackageRequest
+	(*DeletePackageRequest)(nil),  // 4: google.devtools.artifactregistry.v1.DeletePackageRequest
+	(*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp
 }
 var file_google_devtools_artifactregistry_v1_package_proto_depIdxs = []int32{
 	5, // 0: google.devtools.artifactregistry.v1.Package.create_time:type_name -> google.protobuf.Timestamp
diff --git a/artifactregistry/apiv1/artifactregistrypb/repository.pb.go b/artifactregistry/apiv1/artifactregistrypb/repository.pb.go
index 96117d3ed58..257536aa28b 100644
--- a/artifactregistry/apiv1/artifactregistrypb/repository.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/repository.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/repository.proto
 
 package artifactregistrypb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -188,9 +188,9 @@ type Repository struct {
 	// and dashes.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The time when the repository was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time when the repository was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The Cloud KMS resource name of the customer managed encryption key that's
 	// used to encrypt the contents of the Repository. Has the form:
 	// `projects/my-project/locations/my-region/keyRings/my-kr/cryptoKeys/my-key`.
@@ -272,14 +272,14 @@ func (x *Repository) GetLabels() map[string]string {
 	return nil
 }
 
-func (x *Repository) GetCreateTime() *timestamp.Timestamp {
+func (x *Repository) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Repository) GetUpdateTime() *timestamp.Timestamp {
+func (x *Repository) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -558,7 +558,7 @@ type UpdateRepositoryRequest struct {
 	// The update mask applies to the resource. For the `FieldMask` definition,
 	// see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateRepositoryRequest) Reset() {
@@ -600,7 +600,7 @@ func (x *UpdateRepositoryRequest) GetRepository() *Repository {
 	return nil
 }
 
-func (x *UpdateRepositoryRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateRepositoryRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -902,8 +902,8 @@ var file_google_devtools_artifactregistry_v1_repository_proto_goTypes = []interf
 	(*DeleteRepositoryRequest)(nil),                     // 8: google.devtools.artifactregistry.v1.DeleteRepositoryRequest
 	(*Repository_MavenRepositoryConfig)(nil),            // 9: google.devtools.artifactregistry.v1.Repository.MavenRepositoryConfig
 	nil,                                                 // 10: google.devtools.artifactregistry.v1.Repository.LabelsEntry
-	(*timestamp.Timestamp)(nil),                         // 11: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                        // 12: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                       // 11: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                       // 12: google.protobuf.FieldMask
 }
 var file_google_devtools_artifactregistry_v1_repository_proto_depIdxs = []int32{
 	9,  // 0: google.devtools.artifactregistry.v1.Repository.maven_config:type_name -> google.devtools.artifactregistry.v1.Repository.MavenRepositoryConfig
diff --git a/artifactregistry/apiv1/artifactregistrypb/service.pb.go b/artifactregistry/apiv1/artifactregistrypb/service.pb.go
index 22a3b3d96be..ed1c6b883c7 100644
--- a/artifactregistry/apiv1/artifactregistrypb/service.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/service.proto
 
 package artifactregistrypb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	v1 "google.golang.org/genproto/googleapis/iam/v1"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
@@ -34,6 +33,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -594,7 +594,7 @@ var file_google_devtools_artifactregistry_v1_service_proto_goTypes = []interface
 	(*File)(nil),                          // 38: google.devtools.artifactregistry.v1.File
 	(*ListTagsResponse)(nil),              // 39: google.devtools.artifactregistry.v1.ListTagsResponse
 	(*Tag)(nil),                           // 40: google.devtools.artifactregistry.v1.Tag
-	(*empty.Empty)(nil),                   // 41: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                 // 41: google.protobuf.Empty
 	(*v1.Policy)(nil),                     // 42: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil), // 43: google.iam.v1.TestIamPermissionsResponse
 	(*ProjectSettings)(nil),               // 44: google.devtools.artifactregistry.v1.ProjectSettings
@@ -775,7 +775,7 @@ type ArtifactRegistryClient interface {
 	// Updates a tag.
 	UpdateTag(ctx context.Context, in *UpdateTagRequest, opts ...grpc.CallOption) (*Tag, error)
 	// Deletes a tag.
-	DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates the IAM policy for a given resource.
 	SetIamPolicy(ctx context.Context, in *v1.SetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Gets the IAM policy for a given resource.
@@ -985,8 +985,8 @@ func (c *artifactRegistryClient) UpdateTag(ctx context.Context, in *UpdateTagReq
 	return out, nil
 }
 
-func (c *artifactRegistryClient) DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *artifactRegistryClient) DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.devtools.artifactregistry.v1.ArtifactRegistry/DeleteTag", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1095,7 +1095,7 @@ type ArtifactRegistryServer interface {
 	// Updates a tag.
 	UpdateTag(context.Context, *UpdateTagRequest) (*Tag, error)
 	// Deletes a tag.
-	DeleteTag(context.Context, *DeleteTagRequest) (*empty.Empty, error)
+	DeleteTag(context.Context, *DeleteTagRequest) (*emptypb.Empty, error)
 	// Updates the IAM policy for a given resource.
 	SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error)
 	// Gets the IAM policy for a given resource.
@@ -1175,7 +1175,7 @@ func (*UnimplementedArtifactRegistryServer) CreateTag(context.Context, *CreateTa
 func (*UnimplementedArtifactRegistryServer) UpdateTag(context.Context, *UpdateTagRequest) (*Tag, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateTag not implemented")
 }
-func (*UnimplementedArtifactRegistryServer) DeleteTag(context.Context, *DeleteTagRequest) (*empty.Empty, error) {
+func (*UnimplementedArtifactRegistryServer) DeleteTag(context.Context, *DeleteTagRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTag not implemented")
 }
 func (*UnimplementedArtifactRegistryServer) SetIamPolicy(context.Context, *v1.SetIamPolicyRequest) (*v1.Policy, error) {
diff --git a/artifactregistry/apiv1/artifactregistrypb/settings.pb.go b/artifactregistry/apiv1/artifactregistrypb/settings.pb.go
index 8052492e30a..bf9acb852d6 100644
--- a/artifactregistry/apiv1/artifactregistrypb/settings.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/settings.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/settings.proto
 
 package artifactregistrypb
@@ -25,9 +25,9 @@ import (
 	sync "sync"
 
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -216,7 +216,7 @@ type UpdateProjectSettingsRequest struct {
 	// The project settings.
 	ProjectSettings *ProjectSettings `protobuf:"bytes,2,opt,name=project_settings,json=projectSettings,proto3" json:"project_settings,omitempty"`
 	// Field mask to support partial updates.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateProjectSettingsRequest) Reset() {
@@ -258,7 +258,7 @@ func (x *UpdateProjectSettingsRequest) GetProjectSettings() *ProjectSettings {
 	return nil
 }
 
-func (x *UpdateProjectSettingsRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateProjectSettingsRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -363,7 +363,7 @@ var file_google_devtools_artifactregistry_v1_settings_proto_goTypes = []interfac
 	(*ProjectSettings)(nil),               // 1: google.devtools.artifactregistry.v1.ProjectSettings
 	(*GetProjectSettingsRequest)(nil),     // 2: google.devtools.artifactregistry.v1.GetProjectSettingsRequest
 	(*UpdateProjectSettingsRequest)(nil),  // 3: google.devtools.artifactregistry.v1.UpdateProjectSettingsRequest
-	(*field_mask.FieldMask)(nil),          // 4: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),         // 4: google.protobuf.FieldMask
 }
 var file_google_devtools_artifactregistry_v1_settings_proto_depIdxs = []int32{
 	0, // 0: google.devtools.artifactregistry.v1.ProjectSettings.legacy_redirection_state:type_name -> google.devtools.artifactregistry.v1.ProjectSettings.RedirectionState
diff --git a/artifactregistry/apiv1/artifactregistrypb/tag.pb.go b/artifactregistry/apiv1/artifactregistrypb/tag.pb.go
index c4f8d9ef07b..3a7d8a24172 100644
--- a/artifactregistry/apiv1/artifactregistrypb/tag.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/tag.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/tag.proto
 
 package artifactregistrypb
@@ -25,9 +25,9 @@ import (
 	sync "sync"
 
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -373,7 +373,7 @@ type UpdateTagRequest struct {
 	// The update mask applies to the resource. For the `FieldMask` definition,
 	// see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateTagRequest) Reset() {
@@ -415,7 +415,7 @@ func (x *UpdateTagRequest) GetTag() *Tag {
 	return nil
 }
 
-func (x *UpdateTagRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTagRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -565,14 +565,14 @@ func file_google_devtools_artifactregistry_v1_tag_proto_rawDescGZIP() []byte {
 
 var file_google_devtools_artifactregistry_v1_tag_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_google_devtools_artifactregistry_v1_tag_proto_goTypes = []interface{}{
-	(*Tag)(nil),                  // 0: google.devtools.artifactregistry.v1.Tag
-	(*ListTagsRequest)(nil),      // 1: google.devtools.artifactregistry.v1.ListTagsRequest
-	(*ListTagsResponse)(nil),     // 2: google.devtools.artifactregistry.v1.ListTagsResponse
-	(*GetTagRequest)(nil),        // 3: google.devtools.artifactregistry.v1.GetTagRequest
-	(*CreateTagRequest)(nil),     // 4: google.devtools.artifactregistry.v1.CreateTagRequest
-	(*UpdateTagRequest)(nil),     // 5: google.devtools.artifactregistry.v1.UpdateTagRequest
-	(*DeleteTagRequest)(nil),     // 6: google.devtools.artifactregistry.v1.DeleteTagRequest
-	(*field_mask.FieldMask)(nil), // 7: google.protobuf.FieldMask
+	(*Tag)(nil),                   // 0: google.devtools.artifactregistry.v1.Tag
+	(*ListTagsRequest)(nil),       // 1: google.devtools.artifactregistry.v1.ListTagsRequest
+	(*ListTagsResponse)(nil),      // 2: google.devtools.artifactregistry.v1.ListTagsResponse
+	(*GetTagRequest)(nil),         // 3: google.devtools.artifactregistry.v1.GetTagRequest
+	(*CreateTagRequest)(nil),      // 4: google.devtools.artifactregistry.v1.CreateTagRequest
+	(*UpdateTagRequest)(nil),      // 5: google.devtools.artifactregistry.v1.UpdateTagRequest
+	(*DeleteTagRequest)(nil),      // 6: google.devtools.artifactregistry.v1.DeleteTagRequest
+	(*fieldmaskpb.FieldMask)(nil), // 7: google.protobuf.FieldMask
 }
 var file_google_devtools_artifactregistry_v1_tag_proto_depIdxs = []int32{
 	0, // 0: google.devtools.artifactregistry.v1.ListTagsResponse.tags:type_name -> google.devtools.artifactregistry.v1.Tag
diff --git a/artifactregistry/apiv1/artifactregistrypb/version.pb.go b/artifactregistry/apiv1/artifactregistrypb/version.pb.go
index 74bfdabc3dd..3c7124c4b46 100644
--- a/artifactregistry/apiv1/artifactregistrypb/version.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/version.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/version.proto
 
 package artifactregistrypb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -109,9 +109,9 @@ type Version struct {
 	// Optional. Description of the version, as specified in its metadata.
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// The time when the version was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time when the version was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. A list of related tags. Will contain up to 100 tags that
 	// reference this version.
 	RelatedTags []*Tag `protobuf:"bytes,7,rep,name=related_tags,json=relatedTags,proto3" json:"related_tags,omitempty"`
@@ -119,7 +119,7 @@ type Version struct {
 	// The fields returned are defined by the underlying repository-specific
 	// resource. Currently, the only resource in use is
 	// [DockerImage][google.devtools.artifactregistry.v1.DockerImage]
-	Metadata *_struct.Struct `protobuf:"bytes,8,opt,name=metadata,proto3" json:"metadata,omitempty"`
+	Metadata *structpb.Struct `protobuf:"bytes,8,opt,name=metadata,proto3" json:"metadata,omitempty"`
 }
 
 func (x *Version) Reset() {
@@ -168,14 +168,14 @@ func (x *Version) GetDescription() string {
 	return ""
 }
 
-func (x *Version) GetCreateTime() *timestamp.Timestamp {
+func (x *Version) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Version) GetUpdateTime() *timestamp.Timestamp {
+func (x *Version) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -189,7 +189,7 @@ func (x *Version) GetRelatedTags() []*Tag {
 	return nil
 }
 
-func (x *Version) GetMetadata() *_struct.Struct {
+func (x *Version) GetMetadata() *structpb.Struct {
 	if x != nil {
 		return x.Metadata
 	}
@@ -577,15 +577,15 @@ func file_google_devtools_artifactregistry_v1_version_proto_rawDescGZIP() []byte
 var file_google_devtools_artifactregistry_v1_version_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_devtools_artifactregistry_v1_version_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_google_devtools_artifactregistry_v1_version_proto_goTypes = []interface{}{
-	(VersionView)(0),             // 0: google.devtools.artifactregistry.v1.VersionView
-	(*Version)(nil),              // 1: google.devtools.artifactregistry.v1.Version
-	(*ListVersionsRequest)(nil),  // 2: google.devtools.artifactregistry.v1.ListVersionsRequest
-	(*ListVersionsResponse)(nil), // 3: google.devtools.artifactregistry.v1.ListVersionsResponse
-	(*GetVersionRequest)(nil),    // 4: google.devtools.artifactregistry.v1.GetVersionRequest
-	(*DeleteVersionRequest)(nil), // 5: google.devtools.artifactregistry.v1.DeleteVersionRequest
-	(*timestamp.Timestamp)(nil),  // 6: google.protobuf.Timestamp
-	(*Tag)(nil),                  // 7: google.devtools.artifactregistry.v1.Tag
-	(*_struct.Struct)(nil),       // 8: google.protobuf.Struct
+	(VersionView)(0),              // 0: google.devtools.artifactregistry.v1.VersionView
+	(*Version)(nil),               // 1: google.devtools.artifactregistry.v1.Version
+	(*ListVersionsRequest)(nil),   // 2: google.devtools.artifactregistry.v1.ListVersionsRequest
+	(*ListVersionsResponse)(nil),  // 3: google.devtools.artifactregistry.v1.ListVersionsResponse
+	(*GetVersionRequest)(nil),     // 4: google.devtools.artifactregistry.v1.GetVersionRequest
+	(*DeleteVersionRequest)(nil),  // 5: google.devtools.artifactregistry.v1.DeleteVersionRequest
+	(*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp
+	(*Tag)(nil),                   // 7: google.devtools.artifactregistry.v1.Tag
+	(*structpb.Struct)(nil),       // 8: google.protobuf.Struct
 }
 var file_google_devtools_artifactregistry_v1_version_proto_depIdxs = []int32{
 	6, // 0: google.devtools.artifactregistry.v1.Version.create_time:type_name -> google.protobuf.Timestamp
diff --git a/artifactregistry/apiv1/artifactregistrypb/yum_artifact.pb.go b/artifactregistry/apiv1/artifactregistrypb/yum_artifact.pb.go
index ac19dda763b..680d87383b3 100644
--- a/artifactregistry/apiv1/artifactregistrypb/yum_artifact.pb.go
+++ b/artifactregistry/apiv1/artifactregistrypb/yum_artifact.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/artifactregistry/v1/yum_artifact.proto
 
 package artifactregistrypb
diff --git a/artifactregistry/apiv1/doc.go b/artifactregistry/apiv1/doc.go
index f65adaf4089..d072a40fcd3 100644
--- a/artifactregistry/apiv1/doc.go
+++ b/artifactregistry/apiv1/doc.go
@@ -60,7 +60,7 @@
 //
 //	req := &artifactregistrypb.ListDockerImagesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListDockerImagesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListDockerImagesRequest.
 //	}
 //	it := c.ListDockerImages(ctx, req)
 //	for {
diff --git a/artifactregistry/go.mod b/artifactregistry/go.mod
index 06e5285cc6a..435c4d76904 100644
--- a/artifactregistry/go.mod
+++ b/artifactregistry/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/artifactregistry
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/artifactregistry/go.sum b/artifactregistry/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/artifactregistry/go.sum
+++ b/artifactregistry/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/asset/apiv1/asset_client.go b/asset/apiv1/asset_client.go
index 14ae3daba11..edb9cd0cce7 100644
--- a/asset/apiv1/asset_client.go
+++ b/asset/apiv1/asset_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/asset/apiv1/asset_client_example_test.go b/asset/apiv1/asset_client_example_test.go
index 5bb62ae4a0c..32370a6c0ef 100644
--- a/asset/apiv1/asset_client_example_test.go
+++ b/asset/apiv1/asset_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 	"google.golang.org/api/iterator"
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleClient_ExportAssets() {
 
 	req := &assetpb.ExportAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ExportAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ExportAssetsRequest.
 	}
 	op, err := c.ExportAssets(ctx, req)
 	if err != nil {
@@ -87,7 +87,7 @@ func ExampleClient_ListAssets() {
 
 	req := &assetpb.ListAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ListAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ListAssetsRequest.
 	}
 	it := c.ListAssets(ctx, req)
 	for {
@@ -118,7 +118,7 @@ func ExampleClient_BatchGetAssetsHistory() {
 
 	req := &assetpb.BatchGetAssetsHistoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#BatchGetAssetsHistoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#BatchGetAssetsHistoryRequest.
 	}
 	resp, err := c.BatchGetAssetsHistory(ctx, req)
 	if err != nil {
@@ -143,7 +143,7 @@ func ExampleClient_CreateFeed() {
 
 	req := &assetpb.CreateFeedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#CreateFeedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#CreateFeedRequest.
 	}
 	resp, err := c.CreateFeed(ctx, req)
 	if err != nil {
@@ -168,7 +168,7 @@ func ExampleClient_GetFeed() {
 
 	req := &assetpb.GetFeedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#GetFeedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#GetFeedRequest.
 	}
 	resp, err := c.GetFeed(ctx, req)
 	if err != nil {
@@ -193,7 +193,7 @@ func ExampleClient_ListFeeds() {
 
 	req := &assetpb.ListFeedsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ListFeedsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ListFeedsRequest.
 	}
 	resp, err := c.ListFeeds(ctx, req)
 	if err != nil {
@@ -218,7 +218,7 @@ func ExampleClient_UpdateFeed() {
 
 	req := &assetpb.UpdateFeedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#UpdateFeedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#UpdateFeedRequest.
 	}
 	resp, err := c.UpdateFeed(ctx, req)
 	if err != nil {
@@ -243,7 +243,7 @@ func ExampleClient_DeleteFeed() {
 
 	req := &assetpb.DeleteFeedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#DeleteFeedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#DeleteFeedRequest.
 	}
 	err = c.DeleteFeed(ctx, req)
 	if err != nil {
@@ -266,7 +266,7 @@ func ExampleClient_SearchAllResources() {
 
 	req := &assetpb.SearchAllResourcesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#SearchAllResourcesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#SearchAllResourcesRequest.
 	}
 	it := c.SearchAllResources(ctx, req)
 	for {
@@ -297,7 +297,7 @@ func ExampleClient_SearchAllIamPolicies() {
 
 	req := &assetpb.SearchAllIamPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#SearchAllIamPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#SearchAllIamPoliciesRequest.
 	}
 	it := c.SearchAllIamPolicies(ctx, req)
 	for {
@@ -328,7 +328,7 @@ func ExampleClient_AnalyzeIamPolicy() {
 
 	req := &assetpb.AnalyzeIamPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#AnalyzeIamPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#AnalyzeIamPolicyRequest.
 	}
 	resp, err := c.AnalyzeIamPolicy(ctx, req)
 	if err != nil {
@@ -353,7 +353,7 @@ func ExampleClient_AnalyzeIamPolicyLongrunning() {
 
 	req := &assetpb.AnalyzeIamPolicyLongrunningRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#AnalyzeIamPolicyLongrunningRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#AnalyzeIamPolicyLongrunningRequest.
 	}
 	op, err := c.AnalyzeIamPolicyLongrunning(ctx, req)
 	if err != nil {
@@ -383,7 +383,7 @@ func ExampleClient_AnalyzeMove() {
 
 	req := &assetpb.AnalyzeMoveRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#AnalyzeMoveRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#AnalyzeMoveRequest.
 	}
 	resp, err := c.AnalyzeMove(ctx, req)
 	if err != nil {
@@ -408,7 +408,7 @@ func ExampleClient_QueryAssets() {
 
 	req := &assetpb.QueryAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#QueryAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#QueryAssetsRequest.
 	}
 	resp, err := c.QueryAssets(ctx, req)
 	if err != nil {
@@ -433,7 +433,7 @@ func ExampleClient_CreateSavedQuery() {
 
 	req := &assetpb.CreateSavedQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#CreateSavedQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#CreateSavedQueryRequest.
 	}
 	resp, err := c.CreateSavedQuery(ctx, req)
 	if err != nil {
@@ -458,7 +458,7 @@ func ExampleClient_GetSavedQuery() {
 
 	req := &assetpb.GetSavedQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#GetSavedQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#GetSavedQueryRequest.
 	}
 	resp, err := c.GetSavedQuery(ctx, req)
 	if err != nil {
@@ -483,7 +483,7 @@ func ExampleClient_ListSavedQueries() {
 
 	req := &assetpb.ListSavedQueriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ListSavedQueriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ListSavedQueriesRequest.
 	}
 	it := c.ListSavedQueries(ctx, req)
 	for {
@@ -514,7 +514,7 @@ func ExampleClient_UpdateSavedQuery() {
 
 	req := &assetpb.UpdateSavedQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#UpdateSavedQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#UpdateSavedQueryRequest.
 	}
 	resp, err := c.UpdateSavedQuery(ctx, req)
 	if err != nil {
@@ -539,7 +539,7 @@ func ExampleClient_DeleteSavedQuery() {
 
 	req := &assetpb.DeleteSavedQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#DeleteSavedQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#DeleteSavedQueryRequest.
 	}
 	err = c.DeleteSavedQuery(ctx, req)
 	if err != nil {
@@ -562,7 +562,7 @@ func ExampleClient_BatchGetEffectiveIamPolicies() {
 
 	req := &assetpb.BatchGetEffectiveIamPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#BatchGetEffectiveIamPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#BatchGetEffectiveIamPoliciesRequest.
 	}
 	resp, err := c.BatchGetEffectiveIamPolicies(ctx, req)
 	if err != nil {
diff --git a/asset/apiv1/assetpb/asset_service.pb.go b/asset/apiv1/assetpb/asset_service.pb.go
index 6c1666d769b..60e9bcce7cf 100644
--- a/asset/apiv1/assetpb/asset_service.pb.go
+++ b/asset/apiv1/assetpb/asset_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/asset/v1/asset_service.proto
 
 package assetpb
@@ -25,21 +25,21 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	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"
 	v1 "google.golang.org/genproto/googleapis/iam/v1"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	expr "google.golang.org/genproto/googleapis/type/expr"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -301,7 +301,7 @@ type AnalyzeIamPolicyLongrunningMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *AnalyzeIamPolicyLongrunningMetadata) Reset() {
@@ -336,7 +336,7 @@ func (*AnalyzeIamPolicyLongrunningMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_asset_v1_asset_service_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *AnalyzeIamPolicyLongrunningMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *AnalyzeIamPolicyLongrunningMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -359,7 +359,7 @@ type ExportAssetsRequest struct {
 	// If not specified, the current time will be used. Due to delays in resource
 	// data collection and indexing, there is a volatile window during which
 	// running the same query may get different results.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// A list of asset types to take a snapshot for. For example:
 	// "compute.googleapis.com/Disk".
 	//
@@ -441,7 +441,7 @@ func (x *ExportAssetsRequest) GetParent() string {
 	return ""
 }
 
-func (x *ExportAssetsRequest) GetReadTime() *timestamp.Timestamp {
+func (x *ExportAssetsRequest) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -485,7 +485,7 @@ type ExportAssetsResponse struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Time the snapshot was taken.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// Output configuration indicating where the results were output to.
 	OutputConfig *OutputConfig `protobuf:"bytes,2,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
 	// Output result indicating where the assets were exported to. For example, a
@@ -528,7 +528,7 @@ func (*ExportAssetsResponse) Descriptor() ([]byte, []int) {
 	return file_google_cloud_asset_v1_asset_service_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *ExportAssetsResponse) GetReadTime() *timestamp.Timestamp {
+func (x *ExportAssetsResponse) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -566,7 +566,7 @@ type ListAssetsRequest struct {
 	// If not specified, the current time will be used. Due to delays in resource
 	// data collection and indexing, there is a volatile window during which
 	// running the same query may get different results.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// A list of asset types to take a snapshot for. For example:
 	// "compute.googleapis.com/Disk".
 	//
@@ -653,7 +653,7 @@ func (x *ListAssetsRequest) GetParent() string {
 	return ""
 }
 
-func (x *ListAssetsRequest) GetReadTime() *timestamp.Timestamp {
+func (x *ListAssetsRequest) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -702,7 +702,7 @@ type ListAssetsResponse struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Time the snapshot was taken.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// Assets.
 	Assets []*Asset `protobuf:"bytes,2,rep,name=assets,proto3" json:"assets,omitempty"`
 	// Token to retrieve the next page of results. It expires 72 hours after the
@@ -743,7 +743,7 @@ func (*ListAssetsResponse) Descriptor() ([]byte, []int) {
 	return file_google_cloud_asset_v1_asset_service_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *ListAssetsResponse) GetReadTime() *timestamp.Timestamp {
+func (x *ListAssetsResponse) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -1169,7 +1169,7 @@ type UpdateFeedRequest struct {
 	// Required. Only updates the `feed` fields indicated by this mask.
 	// The field mask must not be empty, and it must not contain fields that
 	// are immutable or only set by the server.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateFeedRequest) Reset() {
@@ -1211,7 +1211,7 @@ func (x *UpdateFeedRequest) GetFeed() *Feed {
 	return nil
 }
 
-func (x *UpdateFeedRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateFeedRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2192,7 +2192,7 @@ type SearchAllResourcesRequest struct {
 	// If only '*' is specified, all fields including versionedResources will be
 	// returned.
 	// Any invalid field path will trigger INVALID_ARGUMENT error.
-	ReadMask *field_mask.FieldMask `protobuf:"bytes,8,opt,name=read_mask,json=readMask,proto3" json:"read_mask,omitempty"`
+	ReadMask *fieldmaskpb.FieldMask `protobuf:"bytes,8,opt,name=read_mask,json=readMask,proto3" json:"read_mask,omitempty"`
 }
 
 func (x *SearchAllResourcesRequest) Reset() {
@@ -2269,7 +2269,7 @@ func (x *SearchAllResourcesRequest) GetOrderBy() string {
 	return ""
 }
 
-func (x *SearchAllResourcesRequest) GetReadMask() *field_mask.FieldMask {
+func (x *SearchAllResourcesRequest) GetReadMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.ReadMask
 	}
@@ -2715,7 +2715,7 @@ type AnalyzeIamPolicyRequest struct {
 	// If it's not finished until then, you will get a  DEADLINE_EXCEEDED error.
 	//
 	// Default is empty.
-	ExecutionTimeout *duration.Duration `protobuf:"bytes,2,opt,name=execution_timeout,json=executionTimeout,proto3" json:"execution_timeout,omitempty"`
+	ExecutionTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=execution_timeout,json=executionTimeout,proto3" json:"execution_timeout,omitempty"`
 }
 
 func (x *AnalyzeIamPolicyRequest) Reset() {
@@ -2764,7 +2764,7 @@ func (x *AnalyzeIamPolicyRequest) GetSavedAnalysisQuery() string {
 	return ""
 }
 
-func (x *AnalyzeIamPolicyRequest) GetExecutionTimeout() *duration.Duration {
+func (x *AnalyzeIamPolicyRequest) GetExecutionTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.ExecutionTimeout
 	}
@@ -3066,11 +3066,11 @@ type SavedQuery struct {
 	// characters.
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The create time of this saved query.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The account's email address who has created this saved query.
 	Creator string `protobuf:"bytes,4,opt,name=creator,proto3" json:"creator,omitempty"`
 	// Output only. The last update time of this saved query.
-	LastUpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
+	LastUpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
 	// Output only. The account's email address who has updated this saved query most recently.
 	LastUpdater string `protobuf:"bytes,6,opt,name=last_updater,json=lastUpdater,proto3" json:"last_updater,omitempty"`
 	// Labels applied on the resource.
@@ -3127,7 +3127,7 @@ func (x *SavedQuery) GetDescription() string {
 	return ""
 }
 
-func (x *SavedQuery) GetCreateTime() *timestamp.Timestamp {
+func (x *SavedQuery) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -3141,7 +3141,7 @@ func (x *SavedQuery) GetCreator() string {
 	return ""
 }
 
-func (x *SavedQuery) GetLastUpdateTime() *timestamp.Timestamp {
+func (x *SavedQuery) GetLastUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastUpdateTime
 	}
@@ -3468,7 +3468,7 @@ type UpdateSavedQueryRequest struct {
 	// * organizations/organization_number/savedQueries/saved_query_id
 	SavedQuery *SavedQuery `protobuf:"bytes,1,opt,name=saved_query,json=savedQuery,proto3" json:"saved_query,omitempty"`
 	// Required. The list of fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSavedQueryRequest) Reset() {
@@ -3510,7 +3510,7 @@ func (x *UpdateSavedQueryRequest) GetSavedQuery() *SavedQuery {
 	return nil
 }
 
-func (x *UpdateSavedQueryRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSavedQueryRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3990,7 +3990,7 @@ type QueryAssetsRequest struct {
 	// is not complete.
 	//
 	// The field will be ignored when [output_config] is specified.
-	Timeout *duration.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Specifies what time period or point in time to query asset metadata at.
 	// * unset - query asset metadata as it is right now
 	// * [read_time_window] - query asset metadata as it was at any point in time
@@ -4090,7 +4090,7 @@ func (x *QueryAssetsRequest) GetPageToken() string {
 	return ""
 }
 
-func (x *QueryAssetsRequest) GetTimeout() *duration.Duration {
+func (x *QueryAssetsRequest) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -4111,7 +4111,7 @@ func (x *QueryAssetsRequest) GetReadTimeWindow() *TimeWindow {
 	return nil
 }
 
-func (x *QueryAssetsRequest) GetReadTime() *timestamp.Timestamp {
+func (x *QueryAssetsRequest) GetReadTime() *timestamppb.Timestamp {
 	if x, ok := x.GetTime().(*QueryAssetsRequest_ReadTime); ok {
 		return x.ReadTime
 	}
@@ -4158,7 +4158,7 @@ type QueryAssetsRequest_ReadTimeWindow struct {
 
 type QueryAssetsRequest_ReadTime struct {
 	// Optional. Queries cloud assets as they appeared at the specified point in time.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=read_time,json=readTime,proto3,oneof"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=read_time,json=readTime,proto3,oneof"`
 }
 
 func (*QueryAssetsRequest_ReadTimeWindow) isQueryAssetsRequest_Time() {}
@@ -4299,7 +4299,7 @@ type QueryResult struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Each row hold a query result in the format of `Struct`.
-	Rows []*_struct.Struct `protobuf:"bytes,1,rep,name=rows,proto3" json:"rows,omitempty"`
+	Rows []*structpb.Struct `protobuf:"bytes,1,rep,name=rows,proto3" json:"rows,omitempty"`
 	// Describes the format of the [rows].
 	Schema *TableSchema `protobuf:"bytes,2,opt,name=schema,proto3" json:"schema,omitempty"`
 	// Token to retrieve the next page of the results.
@@ -4340,7 +4340,7 @@ func (*QueryResult) Descriptor() ([]byte, []int) {
 	return file_google_cloud_asset_v1_asset_service_proto_rawDescGZIP(), []int{47}
 }
 
-func (x *QueryResult) GetRows() []*_struct.Struct {
+func (x *QueryResult) GetRows() []*structpb.Struct {
 	if x != nil {
 		return x.Rows
 	}
@@ -5037,7 +5037,7 @@ func (m *IamPolicyAnalysisQuery_ConditionContext) GetTimeContext() isIamPolicyAn
 	return nil
 }
 
-func (x *IamPolicyAnalysisQuery_ConditionContext) GetAccessTime() *timestamp.Timestamp {
+func (x *IamPolicyAnalysisQuery_ConditionContext) GetAccessTime() *timestamppb.Timestamp {
 	if x, ok := x.GetTimeContext().(*IamPolicyAnalysisQuery_ConditionContext_AccessTime); ok {
 		return x.AccessTime
 	}
@@ -5052,7 +5052,7 @@ type IamPolicyAnalysisQuery_ConditionContext_AccessTime struct {
 	// The hypothetical access timestamp to evaluate IAM conditions. Note that
 	// this value must not be earlier than the current time; otherwise, an
 	// INVALID_ARGUMENT error will be returned.
-	AccessTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=access_time,json=accessTime,proto3,oneof"`
+	AccessTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=access_time,json=accessTime,proto3,oneof"`
 }
 
 func (*IamPolicyAnalysisQuery_ConditionContext_AccessTime) isIamPolicyAnalysisQuery_ConditionContext_TimeContext() {
@@ -6695,22 +6695,22 @@ var file_google_cloud_asset_v1_asset_service_proto_goTypes = []interface{}{
 	(*QueryAssetsOutputConfig_BigQueryDestination)(nil),                 // 66: google.cloud.asset.v1.QueryAssetsOutputConfig.BigQueryDestination
 	(*BatchGetEffectiveIamPoliciesResponse_EffectiveIamPolicy)(nil),     // 67: google.cloud.asset.v1.BatchGetEffectiveIamPoliciesResponse.EffectiveIamPolicy
 	(*BatchGetEffectiveIamPoliciesResponse_EffectiveIamPolicy_PolicyInfo)(nil), // 68: google.cloud.asset.v1.BatchGetEffectiveIamPoliciesResponse.EffectiveIamPolicy.PolicyInfo
-	(*timestamp.Timestamp)(nil),     // 69: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),   // 69: google.protobuf.Timestamp
 	(*Asset)(nil),                   // 70: google.cloud.asset.v1.Asset
 	(*TimeWindow)(nil),              // 71: google.cloud.asset.v1.TimeWindow
 	(*TemporalAsset)(nil),           // 72: google.cloud.asset.v1.TemporalAsset
-	(*field_mask.FieldMask)(nil),    // 73: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),   // 73: google.protobuf.FieldMask
 	(*expr.Expr)(nil),               // 74: google.type.Expr
 	(*ResourceSearchResult)(nil),    // 75: google.cloud.asset.v1.ResourceSearchResult
 	(*IamPolicySearchResult)(nil),   // 76: google.cloud.asset.v1.IamPolicySearchResult
-	(*duration.Duration)(nil),       // 77: google.protobuf.Duration
+	(*durationpb.Duration)(nil),     // 77: google.protobuf.Duration
 	(*status.Status)(nil),           // 78: google.rpc.Status
-	(*_struct.Struct)(nil),          // 79: google.protobuf.Struct
+	(*structpb.Struct)(nil),         // 79: google.protobuf.Struct
 	(*IamPolicyAnalysisResult)(nil), // 80: google.cloud.asset.v1.IamPolicyAnalysisResult
 	(*IamPolicyAnalysisState)(nil),  // 81: google.cloud.asset.v1.IamPolicyAnalysisState
 	(*v1.Policy)(nil),               // 82: google.iam.v1.Policy
 	(*longrunning.Operation)(nil),   // 83: google.longrunning.Operation
-	(*empty.Empty)(nil),             // 84: google.protobuf.Empty
+	(*emptypb.Empty)(nil),           // 84: google.protobuf.Empty
 }
 var file_google_cloud_asset_v1_asset_service_proto_depIdxs = []int32{
 	69, // 0: google.cloud.asset.v1.AnalyzeIamPolicyLongrunningMetadata.create_time:type_name -> google.protobuf.Timestamp
@@ -7718,7 +7718,7 @@ type AssetServiceClient interface {
 	// Updates an asset feed configuration.
 	UpdateFeed(ctx context.Context, in *UpdateFeedRequest, opts ...grpc.CallOption) (*Feed, error)
 	// Deletes an asset feed.
-	DeleteFeed(ctx context.Context, in *DeleteFeedRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteFeed(ctx context.Context, in *DeleteFeedRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Searches all Cloud resources within the specified scope, such as a project,
 	// folder, or organization. The caller must be granted the
 	// `cloudasset.assets.searchAllResources` permission on the desired scope,
@@ -7772,7 +7772,7 @@ type AssetServiceClient interface {
 	// Updates a saved query.
 	UpdateSavedQuery(ctx context.Context, in *UpdateSavedQueryRequest, opts ...grpc.CallOption) (*SavedQuery, error)
 	// Deletes a saved query.
-	DeleteSavedQuery(ctx context.Context, in *DeleteSavedQueryRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteSavedQuery(ctx context.Context, in *DeleteSavedQueryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets effective IAM policies for a batch of resources.
 	BatchGetEffectiveIamPolicies(ctx context.Context, in *BatchGetEffectiveIamPoliciesRequest, opts ...grpc.CallOption) (*BatchGetEffectiveIamPoliciesResponse, error)
 }
@@ -7848,8 +7848,8 @@ func (c *assetServiceClient) UpdateFeed(ctx context.Context, in *UpdateFeedReque
 	return out, nil
 }
 
-func (c *assetServiceClient) DeleteFeed(ctx context.Context, in *DeleteFeedRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *assetServiceClient) DeleteFeed(ctx context.Context, in *DeleteFeedRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.asset.v1.AssetService/DeleteFeed", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -7947,8 +7947,8 @@ func (c *assetServiceClient) UpdateSavedQuery(ctx context.Context, in *UpdateSav
 	return out, nil
 }
 
-func (c *assetServiceClient) DeleteSavedQuery(ctx context.Context, in *DeleteSavedQueryRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *assetServiceClient) DeleteSavedQuery(ctx context.Context, in *DeleteSavedQueryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.asset.v1.AssetService/DeleteSavedQuery", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -7999,7 +7999,7 @@ type AssetServiceServer interface {
 	// Updates an asset feed configuration.
 	UpdateFeed(context.Context, *UpdateFeedRequest) (*Feed, error)
 	// Deletes an asset feed.
-	DeleteFeed(context.Context, *DeleteFeedRequest) (*empty.Empty, error)
+	DeleteFeed(context.Context, *DeleteFeedRequest) (*emptypb.Empty, error)
 	// Searches all Cloud resources within the specified scope, such as a project,
 	// folder, or organization. The caller must be granted the
 	// `cloudasset.assets.searchAllResources` permission on the desired scope,
@@ -8053,7 +8053,7 @@ type AssetServiceServer interface {
 	// Updates a saved query.
 	UpdateSavedQuery(context.Context, *UpdateSavedQueryRequest) (*SavedQuery, error)
 	// Deletes a saved query.
-	DeleteSavedQuery(context.Context, *DeleteSavedQueryRequest) (*empty.Empty, error)
+	DeleteSavedQuery(context.Context, *DeleteSavedQueryRequest) (*emptypb.Empty, error)
 	// Gets effective IAM policies for a batch of resources.
 	BatchGetEffectiveIamPolicies(context.Context, *BatchGetEffectiveIamPoliciesRequest) (*BatchGetEffectiveIamPoliciesResponse, error)
 }
@@ -8083,7 +8083,7 @@ func (*UnimplementedAssetServiceServer) ListFeeds(context.Context, *ListFeedsReq
 func (*UnimplementedAssetServiceServer) UpdateFeed(context.Context, *UpdateFeedRequest) (*Feed, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method UpdateFeed not implemented")
 }
-func (*UnimplementedAssetServiceServer) DeleteFeed(context.Context, *DeleteFeedRequest) (*empty.Empty, error) {
+func (*UnimplementedAssetServiceServer) DeleteFeed(context.Context, *DeleteFeedRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteFeed not implemented")
 }
 func (*UnimplementedAssetServiceServer) SearchAllResources(context.Context, *SearchAllResourcesRequest) (*SearchAllResourcesResponse, error) {
@@ -8116,7 +8116,7 @@ func (*UnimplementedAssetServiceServer) ListSavedQueries(context.Context, *ListS
 func (*UnimplementedAssetServiceServer) UpdateSavedQuery(context.Context, *UpdateSavedQueryRequest) (*SavedQuery, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method UpdateSavedQuery not implemented")
 }
-func (*UnimplementedAssetServiceServer) DeleteSavedQuery(context.Context, *DeleteSavedQueryRequest) (*empty.Empty, error) {
+func (*UnimplementedAssetServiceServer) DeleteSavedQuery(context.Context, *DeleteSavedQueryRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteSavedQuery not implemented")
 }
 func (*UnimplementedAssetServiceServer) BatchGetEffectiveIamPolicies(context.Context, *BatchGetEffectiveIamPoliciesRequest) (*BatchGetEffectiveIamPoliciesResponse, error) {
diff --git a/asset/apiv1/assetpb/assets.pb.go b/asset/apiv1/assetpb/assets.pb.go
index 9413dc44b6f..67ac3b9cbbf 100644
--- a/asset/apiv1/assetpb/assets.pb.go
+++ b/asset/apiv1/assetpb/assets.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/asset/v1/assets.proto
 
 package assetpb
@@ -24,8 +24,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	v11 "google.golang.org/genproto/googleapis/cloud/orgpolicy/v1"
 	v12 "google.golang.org/genproto/googleapis/cloud/osconfig/v1"
@@ -34,6 +32,8 @@ import (
 	code "google.golang.org/genproto/googleapis/rpc/code"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -257,10 +257,10 @@ type TimeWindow struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Start time of the time window (exclusive).
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of the time window (inclusive). If not specified, the current
 	// timestamp is used instead.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *TimeWindow) Reset() {
@@ -295,14 +295,14 @@ func (*TimeWindow) Descriptor() ([]byte, []int) {
 	return file_google_cloud_asset_v1_assets_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *TimeWindow) GetStartTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *TimeWindow) GetEndTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -325,7 +325,7 @@ type Asset struct {
 
 	// The last update timestamp of an asset. update_time is updated when
 	// create/update/delete operation is performed.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The full name of the asset. Example:
 	// `//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1`
 	//
@@ -422,7 +422,7 @@ func (*Asset) Descriptor() ([]byte, []int) {
 	return file_google_cloud_asset_v1_assets_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *Asset) GetUpdateTime() *timestamp.Timestamp {
+func (x *Asset) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -591,7 +591,7 @@ type Resource struct {
 	Parent string `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"`
 	// The content of the resource, in which some sensitive fields are removed
 	// and may not be present.
-	Data *_struct.Struct `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"`
+	Data *structpb.Struct `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"`
 	// The location of the resource in Google Cloud, such as its zone and region.
 	// For more information, see https://cloud.google.com/about/locations/.
 	Location string `protobuf:"bytes,8,opt,name=location,proto3" json:"location,omitempty"`
@@ -664,7 +664,7 @@ func (x *Resource) GetParent() string {
 	return ""
 }
 
-func (x *Resource) GetData() *_struct.Struct {
+func (x *Resource) GetData() *structpb.Struct {
 	if x != nil {
 		return x.Data
 	}
@@ -1070,7 +1070,7 @@ type ResourceSearchResult struct {
 	//   - value in date string. Example: `createTime > 2021-01-01`
 	//   - value in date-time string (must be quoted). Example: `createTime >
 	//     "2021-01-01T00:00:00"`
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The last update timestamp of this resource, at which the resource was last
 	// modified or deleted. The granularity is in seconds. Timestamp.nanos will
 	// always be 0. This field is available only when the resource's Protobuf
@@ -1083,7 +1083,7 @@ type ResourceSearchResult struct {
 	//   - value in date string. Example: `updateTime < 2021-01-01`
 	//   - value in date-time string (must be quoted). Example: `updateTime <
 	//     "2021-01-01T00:00:00"`
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The state of this resource. Different resources types have different state
 	// definitions that are mapped from various fields of different resource
 	// types. This field is available only when the resource's Protobuf contains
@@ -1124,7 +1124,7 @@ type ResourceSearchResult struct {
 	//   - Use a free text query to match the attributes values. Example: to search
 	//     `additional_attributes = { dnsName: "foobar" }`, you can issue a query
 	//     `foobar`.
-	AdditionalAttributes *_struct.Struct `protobuf:"bytes,9,opt,name=additional_attributes,json=additionalAttributes,proto3" json:"additional_attributes,omitempty"`
+	AdditionalAttributes *structpb.Struct `protobuf:"bytes,9,opt,name=additional_attributes,json=additionalAttributes,proto3" json:"additional_attributes,omitempty"`
 	// The full resource name of this resource's parent, if it has one.
 	// To search against the `parent_full_resource_name`:
 	//
@@ -1318,14 +1318,14 @@ func (x *ResourceSearchResult) GetKmsKeys() []string {
 	return nil
 }
 
-func (x *ResourceSearchResult) GetCreateTime() *timestamp.Timestamp {
+func (x *ResourceSearchResult) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ResourceSearchResult) GetUpdateTime() *timestamp.Timestamp {
+func (x *ResourceSearchResult) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1339,7 +1339,7 @@ func (x *ResourceSearchResult) GetState() string {
 	return ""
 }
 
-func (x *ResourceSearchResult) GetAdditionalAttributes() *_struct.Struct {
+func (x *ResourceSearchResult) GetAdditionalAttributes() *structpb.Struct {
 	if x != nil {
 		return x.AdditionalAttributes
 	}
@@ -1428,7 +1428,7 @@ type VersionedResource struct {
 	// You can find the resource definition for each supported resource type in
 	// this table:
 	// `https://cloud.google.com/asset-inventory/docs/supported-asset-types#searchable_asset_types`
-	Resource *_struct.Struct `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
+	Resource *structpb.Struct `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
 }
 
 func (x *VersionedResource) Reset() {
@@ -1470,7 +1470,7 @@ func (x *VersionedResource) GetVersion() string {
 	return ""
 }
 
-func (x *VersionedResource) GetResource() *_struct.Struct {
+func (x *VersionedResource) GetResource() *structpb.Struct {
 	if x != nil {
 		return x.Resource
 	}
@@ -3056,14 +3056,14 @@ var file_google_cloud_asset_v1_assets_proto_goTypes = []interface{}{
 	(*IamPolicyAnalysisResult_Edge)(nil),              // 26: google.cloud.asset.v1.IamPolicyAnalysisResult.Edge
 	(*IamPolicyAnalysisResult_AccessControlList)(nil), // 27: google.cloud.asset.v1.IamPolicyAnalysisResult.AccessControlList
 	(*IamPolicyAnalysisResult_IdentityList)(nil),      // 28: google.cloud.asset.v1.IamPolicyAnalysisResult.IdentityList
-	(*timestamp.Timestamp)(nil),                       // 29: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                     // 29: google.protobuf.Timestamp
 	(*v1.Policy)(nil),                                 // 30: google.iam.v1.Policy
 	(*v11.Policy)(nil),                                // 31: google.cloud.orgpolicy.v1.Policy
 	(*v13.AccessPolicy)(nil),                          // 32: google.identity.accesscontextmanager.v1.AccessPolicy
 	(*v13.AccessLevel)(nil),                           // 33: google.identity.accesscontextmanager.v1.AccessLevel
 	(*v13.ServicePerimeter)(nil),                      // 34: google.identity.accesscontextmanager.v1.ServicePerimeter
 	(*v12.Inventory)(nil),                             // 35: google.cloud.osconfig.v1.Inventory
-	(*_struct.Struct)(nil),                            // 36: google.protobuf.Struct
+	(*structpb.Struct)(nil),                           // 36: google.protobuf.Struct
 	(code.Code)(0),                                    // 37: google.rpc.Code
 	(*v1.Binding)(nil),                                // 38: google.iam.v1.Binding
 }
diff --git a/asset/apiv1/doc.go b/asset/apiv1/doc.go
index 599f176b186..96f097653b8 100644
--- a/asset/apiv1/doc.go
+++ b/asset/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &assetpb.ExportAssetsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ExportAssetsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ExportAssetsRequest.
 //	}
 //	op, err := c.ExportAssets(ctx, req)
 //	if err != nil {
diff --git a/asset/go.mod b/asset/go.mod
index 9a291b5f3c8..122f12d456e 100644
--- a/asset/go.mod
+++ b/asset/go.mod
@@ -3,24 +3,27 @@ module cloud.google.com/go/asset
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
+	cloud.google.com/go/accesscontextmanager v1.3.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
+	cloud.google.com/go/osconfig v1.9.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/asset/go.sum b/asset/go.sum
index 5ae74cfc056..85484cef4eb 100644
--- a/asset/go.sum
+++ b/asset/go.sum
@@ -1,8 +1,14 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
+cloud.google.com/go/accesscontextmanager v1.3.0 h1:k571J6qjHx6aX3Xc2TTuWjnm445gvwqLM9MnU5vl5sM=
+cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
+cloud.google.com/go/osconfig v1.9.0 h1:Bu+46U3mzvQ1X+fAX+f2eZaiOZw3LekD9sze/i4f7+w=
+cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +68,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +85,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +102,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b h1:IOQ/4u8ZSLV+xns0LQxzdAcdOJTDMWB+0shVM8KWXBE=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/assuredworkloads/apiv1/assured_workloads_client.go b/assuredworkloads/apiv1/assured_workloads_client.go
index abef152e460..bda4941659c 100644
--- a/assuredworkloads/apiv1/assured_workloads_client.go
+++ b/assuredworkloads/apiv1/assured_workloads_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/assuredworkloads/apiv1/assured_workloads_client_example_test.go b/assuredworkloads/apiv1/assured_workloads_client_example_test.go
index 11171ce45f6..0e53e5e859b 100644
--- a/assuredworkloads/apiv1/assured_workloads_client_example_test.go
+++ b/assuredworkloads/apiv1/assured_workloads_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 	"google.golang.org/api/iterator"
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleClient_CreateWorkload() {
 
 	req := &assuredworkloadspb.CreateWorkloadRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#CreateWorkloadRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#CreateWorkloadRequest.
 	}
 	op, err := c.CreateWorkload(ctx, req)
 	if err != nil {
@@ -87,7 +87,7 @@ func ExampleClient_UpdateWorkload() {
 
 	req := &assuredworkloadspb.UpdateWorkloadRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#UpdateWorkloadRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#UpdateWorkloadRequest.
 	}
 	resp, err := c.UpdateWorkload(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_RestrictAllowedResources() {
 
 	req := &assuredworkloadspb.RestrictAllowedResourcesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#RestrictAllowedResourcesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#RestrictAllowedResourcesRequest.
 	}
 	resp, err := c.RestrictAllowedResources(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleClient_DeleteWorkload() {
 
 	req := &assuredworkloadspb.DeleteWorkloadRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#DeleteWorkloadRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#DeleteWorkloadRequest.
 	}
 	err = c.DeleteWorkload(ctx, req)
 	if err != nil {
@@ -160,7 +160,7 @@ func ExampleClient_GetWorkload() {
 
 	req := &assuredworkloadspb.GetWorkloadRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#GetWorkloadRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#GetWorkloadRequest.
 	}
 	resp, err := c.GetWorkload(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleClient_ListWorkloads() {
 
 	req := &assuredworkloadspb.ListWorkloadsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#ListWorkloadsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#ListWorkloadsRequest.
 	}
 	it := c.ListWorkloads(ctx, req)
 	for {
@@ -216,7 +216,7 @@ func ExampleClient_ListViolations() {
 
 	req := &assuredworkloadspb.ListViolationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#ListViolationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#ListViolationsRequest.
 	}
 	it := c.ListViolations(ctx, req)
 	for {
@@ -247,7 +247,7 @@ func ExampleClient_GetViolation() {
 
 	req := &assuredworkloadspb.GetViolationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#GetViolationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#GetViolationRequest.
 	}
 	resp, err := c.GetViolation(ctx, req)
 	if err != nil {
@@ -272,7 +272,7 @@ func ExampleClient_AcknowledgeViolation() {
 
 	req := &assuredworkloadspb.AcknowledgeViolationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#AcknowledgeViolationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#AcknowledgeViolationRequest.
 	}
 	resp, err := c.AcknowledgeViolation(ctx, req)
 	if err != nil {
diff --git a/assuredworkloads/apiv1/assuredworkloadspb/assuredworkloads.pb.go b/assuredworkloads/apiv1/assuredworkloadspb/assuredworkloads.pb.go
index 5afbb5cf1df..5abaa24617f 100644
--- a/assuredworkloads/apiv1/assuredworkloadspb/assuredworkloads.pb.go
+++ b/assuredworkloads/apiv1/assuredworkloadspb/assuredworkloads.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/assuredworkloads/v1/assuredworkloads.proto
 
 package assuredworkloadspb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -689,7 +689,7 @@ type UpdateWorkloadRequest struct {
 	// organizations/{org_id}/locations/{location_id}/workloads/{workload_id}
 	Workload *Workload `protobuf:"bytes,1,opt,name=workload,proto3" json:"workload,omitempty"`
 	// Required. The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateWorkloadRequest) Reset() {
@@ -731,7 +731,7 @@ func (x *UpdateWorkloadRequest) GetWorkload() *Workload {
 	return nil
 }
 
-func (x *UpdateWorkloadRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateWorkloadRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1018,7 +1018,7 @@ type Workload struct {
 	// Required. Immutable. Compliance Regime associated with this workload.
 	ComplianceRegime Workload_ComplianceRegime `protobuf:"varint,4,opt,name=compliance_regime,json=complianceRegime,proto3,enum=google.cloud.assuredworkloads.v1.Workload_ComplianceRegime" json:"compliance_regime,omitempty"`
 	// Output only. Immutable. The Workload creation timestamp.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Optional. The billing account used for the resources which are
 	// direct children of workload. This billing account is initially associated
 	// with the resources created as part of Workload creation.
@@ -1130,7 +1130,7 @@ func (x *Workload) GetComplianceRegime() Workload_ComplianceRegime {
 	return Workload_COMPLIANCE_REGIME_UNSPECIFIED
 }
 
-func (x *Workload) GetCreateTime() *timestamp.Timestamp {
+func (x *Workload) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1222,7 +1222,7 @@ type CreateWorkloadOperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Optional. Time when the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Optional. The display name of the workload.
 	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Optional. The parent of the workload.
@@ -1264,7 +1264,7 @@ func (*CreateWorkloadOperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_assuredworkloads_v1_assuredworkloads_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *CreateWorkloadOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *CreateWorkloadOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1518,9 +1518,9 @@ type TimeWindow struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The start of the time window.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The end of the time window.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *TimeWindow) Reset() {
@@ -1555,14 +1555,14 @@ func (*TimeWindow) Descriptor() ([]byte, []int) {
 	return file_google_cloud_assuredworkloads_v1_assuredworkloads_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *TimeWindow) GetStartTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *TimeWindow) GetEndTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1780,12 +1780,12 @@ type Violation struct {
 	// e.g. OrgPolicy gcp.resourceLocations has non compliant value.
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. Time of the event which triggered the Violation.
-	BeginTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=begin_time,json=beginTime,proto3" json:"begin_time,omitempty"`
+	BeginTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=begin_time,json=beginTime,proto3" json:"begin_time,omitempty"`
 	// Output only. The last time when the Violation record was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Time of the event which fixed the Violation.
 	// If the violation is ACTIVE this will be empty.
-	ResolveTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=resolve_time,json=resolveTime,proto3" json:"resolve_time,omitempty"`
+	ResolveTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=resolve_time,json=resolveTime,proto3" json:"resolve_time,omitempty"`
 	// Output only. Category under which this violation is mapped.
 	// e.g. Location, Service Usage, Access, Encryption, etc.
 	Category string `protobuf:"bytes,6,opt,name=category,proto3" json:"category,omitempty"`
@@ -1812,7 +1812,7 @@ type Violation struct {
 	Acknowledged bool `protobuf:"varint,14,opt,name=acknowledged,proto3" json:"acknowledged,omitempty"`
 	// Optional. Timestamp when this violation was acknowledged last.
 	// This will be absent when acknowledged field is marked as false.
-	AcknowledgementTime *timestamp.Timestamp `protobuf:"bytes,15,opt,name=acknowledgement_time,json=acknowledgementTime,proto3,oneof" json:"acknowledgement_time,omitempty"`
+	AcknowledgementTime *timestamppb.Timestamp `protobuf:"bytes,15,opt,name=acknowledgement_time,json=acknowledgementTime,proto3,oneof" json:"acknowledgement_time,omitempty"`
 	// Output only. Immutable. Audit Log link to find business justification provided for violation
 	// exception. Format:
 	// https://console.cloud.google.com/logs/query;query={logName}{protoPayload.resourceName}{protoPayload.methodName}{timeRange}{organization}
@@ -1865,21 +1865,21 @@ func (x *Violation) GetDescription() string {
 	return ""
 }
 
-func (x *Violation) GetBeginTime() *timestamp.Timestamp {
+func (x *Violation) GetBeginTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.BeginTime
 	}
 	return nil
 }
 
-func (x *Violation) GetUpdateTime() *timestamp.Timestamp {
+func (x *Violation) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Violation) GetResolveTime() *timestamp.Timestamp {
+func (x *Violation) GetResolveTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ResolveTime
 	}
@@ -1935,7 +1935,7 @@ func (x *Violation) GetAcknowledged() bool {
 	return false
 }
 
-func (x *Violation) GetAcknowledgementTime() *timestamp.Timestamp {
+func (x *Violation) GetAcknowledgementTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.AcknowledgementTime
 	}
@@ -2021,11 +2021,11 @@ type Workload_KMSSettings struct {
 
 	// Required. Input only. Immutable. The time at which the Key Management Service will automatically create a
 	// new version of the crypto key and mark it as the primary.
-	NextRotationTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=next_rotation_time,json=nextRotationTime,proto3" json:"next_rotation_time,omitempty"`
+	NextRotationTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=next_rotation_time,json=nextRotationTime,proto3" json:"next_rotation_time,omitempty"`
 	// Required. Input only. Immutable. [next_rotation_time] will be advanced by this period when the Key
 	// Management Service automatically rotates a key. Must be at least 24 hours
 	// and at most 876,000 hours.
-	RotationPeriod *duration.Duration `protobuf:"bytes,2,opt,name=rotation_period,json=rotationPeriod,proto3" json:"rotation_period,omitempty"`
+	RotationPeriod *durationpb.Duration `protobuf:"bytes,2,opt,name=rotation_period,json=rotationPeriod,proto3" json:"rotation_period,omitempty"`
 }
 
 func (x *Workload_KMSSettings) Reset() {
@@ -2060,14 +2060,14 @@ func (*Workload_KMSSettings) Descriptor() ([]byte, []int) {
 	return file_google_cloud_assuredworkloads_v1_assuredworkloads_proto_rawDescGZIP(), []int{6, 1}
 }
 
-func (x *Workload_KMSSettings) GetNextRotationTime() *timestamp.Timestamp {
+func (x *Workload_KMSSettings) GetNextRotationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NextRotationTime
 	}
 	return nil
 }
 
-func (x *Workload_KMSSettings) GetRotationPeriod() *duration.Duration {
+func (x *Workload_KMSSettings) GetRotationPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.RotationPeriod
 	}
@@ -3163,11 +3163,11 @@ var file_google_cloud_assuredworkloads_v1_assuredworkloads_proto_goTypes = []int
 	(*Violation_Remediation_Instructions)(nil),           // 32: google.cloud.assuredworkloads.v1.Violation.Remediation.Instructions
 	(*Violation_Remediation_Instructions_Gcloud)(nil),    // 33: google.cloud.assuredworkloads.v1.Violation.Remediation.Instructions.Gcloud
 	(*Violation_Remediation_Instructions_Console)(nil),   // 34: google.cloud.assuredworkloads.v1.Violation.Remediation.Instructions.Console
-	(*field_mask.FieldMask)(nil),                         // 35: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),                          // 36: google.protobuf.Timestamp
-	(*duration.Duration)(nil),                            // 37: google.protobuf.Duration
+	(*fieldmaskpb.FieldMask)(nil),                        // 35: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                        // 36: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                          // 37: google.protobuf.Duration
 	(*longrunning.Operation)(nil),                        // 38: google.longrunning.Operation
-	(*empty.Empty)(nil),                                  // 39: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                // 39: google.protobuf.Empty
 }
 var file_google_cloud_assuredworkloads_v1_assuredworkloads_proto_depIdxs = []int32{
 	15, // 0: google.cloud.assuredworkloads.v1.CreateWorkloadRequest.workload:type_name -> google.cloud.assuredworkloads.v1.Workload
@@ -3590,7 +3590,7 @@ type AssuredWorkloadsServiceClient interface {
 	// Deletes the workload. Make sure that workload's direct children are already
 	// in a deleted state, otherwise the request will fail with a
 	// FAILED_PRECONDITION error.
-	DeleteWorkload(ctx context.Context, in *DeleteWorkloadRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteWorkload(ctx context.Context, in *DeleteWorkloadRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets Assured Workload associated with a CRM Node
 	GetWorkload(ctx context.Context, in *GetWorkloadRequest, opts ...grpc.CallOption) (*Workload, error)
 	// Lists Assured Workloads under a CRM Node.
@@ -3645,8 +3645,8 @@ func (c *assuredWorkloadsServiceClient) RestrictAllowedResources(ctx context.Con
 	return out, nil
 }
 
-func (c *assuredWorkloadsServiceClient) DeleteWorkload(ctx context.Context, in *DeleteWorkloadRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *assuredWorkloadsServiceClient) DeleteWorkload(ctx context.Context, in *DeleteWorkloadRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.assuredworkloads.v1.AssuredWorkloadsService/DeleteWorkload", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3718,7 +3718,7 @@ type AssuredWorkloadsServiceServer interface {
 	// Deletes the workload. Make sure that workload's direct children are already
 	// in a deleted state, otherwise the request will fail with a
 	// FAILED_PRECONDITION error.
-	DeleteWorkload(context.Context, *DeleteWorkloadRequest) (*empty.Empty, error)
+	DeleteWorkload(context.Context, *DeleteWorkloadRequest) (*emptypb.Empty, error)
 	// Gets Assured Workload associated with a CRM Node
 	GetWorkload(context.Context, *GetWorkloadRequest) (*Workload, error)
 	// Lists Assured Workloads under a CRM Node.
@@ -3751,7 +3751,7 @@ func (*UnimplementedAssuredWorkloadsServiceServer) UpdateWorkload(context.Contex
 func (*UnimplementedAssuredWorkloadsServiceServer) RestrictAllowedResources(context.Context, *RestrictAllowedResourcesRequest) (*RestrictAllowedResourcesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RestrictAllowedResources not implemented")
 }
-func (*UnimplementedAssuredWorkloadsServiceServer) DeleteWorkload(context.Context, *DeleteWorkloadRequest) (*empty.Empty, error) {
+func (*UnimplementedAssuredWorkloadsServiceServer) DeleteWorkload(context.Context, *DeleteWorkloadRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteWorkload not implemented")
 }
 func (*UnimplementedAssuredWorkloadsServiceServer) GetWorkload(context.Context, *GetWorkloadRequest) (*Workload, error) {
diff --git a/assuredworkloads/apiv1/doc.go b/assuredworkloads/apiv1/doc.go
index 56331c88e27..6f2d5f6e5d6 100644
--- a/assuredworkloads/apiv1/doc.go
+++ b/assuredworkloads/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &assuredworkloadspb.CreateWorkloadRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#CreateWorkloadRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#CreateWorkloadRequest.
 //	}
 //	op, err := c.CreateWorkload(ctx, req)
 //	if err != nil {
diff --git a/assuredworkloads/go.mod b/assuredworkloads/go.mod
index 6719e290bd7..4b358d0d2e2 100644
--- a/assuredworkloads/go.mod
+++ b/assuredworkloads/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/assuredworkloads
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/assuredworkloads/go.sum b/assuredworkloads/go.sum
index 4b329766226..197b62f3d3c 100644
--- a/assuredworkloads/go.sum
+++ b/assuredworkloads/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a h1:GH6UPn3ixhWcKDhpnEC55S75cerLPdpp3hrhfKYjZgw=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/automl/apiv1/auto_ml_client.go b/automl/apiv1/auto_ml_client.go
index 63e6e634d6a..81cef7ef7e2 100644
--- a/automl/apiv1/auto_ml_client.go
+++ b/automl/apiv1/auto_ml_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/automl/apiv1/auto_ml_client_example_test.go b/automl/apiv1/auto_ml_client_example_test.go
index 201d077dfe4..4b1f6c0176d 100644
--- a/automl/apiv1/auto_ml_client_example_test.go
+++ b/automl/apiv1/auto_ml_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 	"google.golang.org/api/iterator"
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_CreateDataset() {
 
 	req := &automlpb.CreateDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#CreateDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#CreateDatasetRequest.
 	}
 	op, err := c.CreateDataset(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleClient_GetDataset() {
 
 	req := &automlpb.GetDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#GetDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#GetDatasetRequest.
 	}
 	resp, err := c.GetDataset(ctx, req)
 	if err != nil {
@@ -111,7 +111,7 @@ func ExampleClient_ListDatasets() {
 
 	req := &automlpb.ListDatasetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ListDatasetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ListDatasetsRequest.
 	}
 	it := c.ListDatasets(ctx, req)
 	for {
@@ -142,7 +142,7 @@ func ExampleClient_UpdateDataset() {
 
 	req := &automlpb.UpdateDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#UpdateDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#UpdateDatasetRequest.
 	}
 	resp, err := c.UpdateDataset(ctx, req)
 	if err != nil {
@@ -167,7 +167,7 @@ func ExampleClient_DeleteDataset() {
 
 	req := &automlpb.DeleteDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#DeleteDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#DeleteDatasetRequest.
 	}
 	op, err := c.DeleteDataset(ctx, req)
 	if err != nil {
@@ -195,7 +195,7 @@ func ExampleClient_ImportData() {
 
 	req := &automlpb.ImportDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ImportDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ImportDataRequest.
 	}
 	op, err := c.ImportData(ctx, req)
 	if err != nil {
@@ -223,7 +223,7 @@ func ExampleClient_ExportData() {
 
 	req := &automlpb.ExportDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ExportDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ExportDataRequest.
 	}
 	op, err := c.ExportData(ctx, req)
 	if err != nil {
@@ -251,7 +251,7 @@ func ExampleClient_GetAnnotationSpec() {
 
 	req := &automlpb.GetAnnotationSpecRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#GetAnnotationSpecRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#GetAnnotationSpecRequest.
 	}
 	resp, err := c.GetAnnotationSpec(ctx, req)
 	if err != nil {
@@ -276,7 +276,7 @@ func ExampleClient_CreateModel() {
 
 	req := &automlpb.CreateModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#CreateModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#CreateModelRequest.
 	}
 	op, err := c.CreateModel(ctx, req)
 	if err != nil {
@@ -306,7 +306,7 @@ func ExampleClient_GetModel() {
 
 	req := &automlpb.GetModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#GetModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#GetModelRequest.
 	}
 	resp, err := c.GetModel(ctx, req)
 	if err != nil {
@@ -331,7 +331,7 @@ func ExampleClient_ListModels() {
 
 	req := &automlpb.ListModelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ListModelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ListModelsRequest.
 	}
 	it := c.ListModels(ctx, req)
 	for {
@@ -362,7 +362,7 @@ func ExampleClient_DeleteModel() {
 
 	req := &automlpb.DeleteModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#DeleteModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#DeleteModelRequest.
 	}
 	op, err := c.DeleteModel(ctx, req)
 	if err != nil {
@@ -390,7 +390,7 @@ func ExampleClient_UpdateModel() {
 
 	req := &automlpb.UpdateModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#UpdateModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#UpdateModelRequest.
 	}
 	resp, err := c.UpdateModel(ctx, req)
 	if err != nil {
@@ -415,7 +415,7 @@ func ExampleClient_DeployModel() {
 
 	req := &automlpb.DeployModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#DeployModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#DeployModelRequest.
 	}
 	op, err := c.DeployModel(ctx, req)
 	if err != nil {
@@ -443,7 +443,7 @@ func ExampleClient_UndeployModel() {
 
 	req := &automlpb.UndeployModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#UndeployModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#UndeployModelRequest.
 	}
 	op, err := c.UndeployModel(ctx, req)
 	if err != nil {
@@ -471,7 +471,7 @@ func ExampleClient_ExportModel() {
 
 	req := &automlpb.ExportModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ExportModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ExportModelRequest.
 	}
 	op, err := c.ExportModel(ctx, req)
 	if err != nil {
@@ -499,7 +499,7 @@ func ExampleClient_GetModelEvaluation() {
 
 	req := &automlpb.GetModelEvaluationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#GetModelEvaluationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#GetModelEvaluationRequest.
 	}
 	resp, err := c.GetModelEvaluation(ctx, req)
 	if err != nil {
@@ -524,7 +524,7 @@ func ExampleClient_ListModelEvaluations() {
 
 	req := &automlpb.ListModelEvaluationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ListModelEvaluationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ListModelEvaluationsRequest.
 	}
 	it := c.ListModelEvaluations(ctx, req)
 	for {
diff --git a/automl/apiv1/automlpb/annotation_payload.pb.go b/automl/apiv1/automlpb/annotation_payload.pb.go
index a2c397ed7c5..fcc770c185b 100644
--- a/automl/apiv1/automlpb/annotation_payload.pb.go
+++ b/automl/apiv1/automlpb/annotation_payload.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/annotation_payload.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/annotation_spec.pb.go b/automl/apiv1/automlpb/annotation_spec.pb.go
index f9217c0778b..80f1b0ff86b 100644
--- a/automl/apiv1/automlpb/annotation_spec.pb.go
+++ b/automl/apiv1/automlpb/annotation_spec.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/annotation_spec.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/classification.pb.go b/automl/apiv1/automlpb/classification.pb.go
index bffc5d91d05..b3030a13082 100644
--- a/automl/apiv1/automlpb/classification.pb.go
+++ b/automl/apiv1/automlpb/classification.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/classification.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/data_items.pb.go b/automl/apiv1/automlpb/data_items.pb.go
index 5500a5205e1..29e952305fb 100644
--- a/automl/apiv1/automlpb/data_items.pb.go
+++ b/automl/apiv1/automlpb/data_items.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/data_items.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/dataset.pb.go b/automl/apiv1/automlpb/dataset.pb.go
index 319da243543..5c3a912467b 100644
--- a/automl/apiv1/automlpb/dataset.pb.go
+++ b/automl/apiv1/automlpb/dataset.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/dataset.proto
 
 package automlpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -70,7 +70,7 @@ type Dataset struct {
 	// Output only. The number of examples in the dataset.
 	ExampleCount int32 `protobuf:"varint,21,opt,name=example_count,json=exampleCount,proto3" json:"example_count,omitempty"`
 	// Output only. Timestamp when this dataset was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Used to perform consistent read-modify-write updates. If not set, a blind
 	// "overwrite" update happens.
 	Etag string `protobuf:"bytes,17,opt,name=etag,proto3" json:"etag,omitempty"`
@@ -194,7 +194,7 @@ func (x *Dataset) GetExampleCount() int32 {
 	return 0
 }
 
-func (x *Dataset) GetCreateTime() *timestamp.Timestamp {
+func (x *Dataset) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -394,7 +394,7 @@ var file_google_cloud_automl_v1_dataset_proto_goTypes = []interface{}{
 	(*ImageObjectDetectionDatasetMetadata)(nil), // 5: google.cloud.automl.v1.ImageObjectDetectionDatasetMetadata
 	(*TextExtractionDatasetMetadata)(nil),       // 6: google.cloud.automl.v1.TextExtractionDatasetMetadata
 	(*TextSentimentDatasetMetadata)(nil),        // 7: google.cloud.automl.v1.TextSentimentDatasetMetadata
-	(*timestamp.Timestamp)(nil),                 // 8: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),               // 8: google.protobuf.Timestamp
 }
 var file_google_cloud_automl_v1_dataset_proto_depIdxs = []int32{
 	2, // 0: google.cloud.automl.v1.Dataset.translation_dataset_metadata:type_name -> google.cloud.automl.v1.TranslationDatasetMetadata
diff --git a/automl/apiv1/automlpb/detection.pb.go b/automl/apiv1/automlpb/detection.pb.go
index 78e318b50fe..184362c3e0a 100644
--- a/automl/apiv1/automlpb/detection.pb.go
+++ b/automl/apiv1/automlpb/detection.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/detection.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/geometry.pb.go b/automl/apiv1/automlpb/geometry.pb.go
index 25ffd3746ae..2a5a8a55521 100644
--- a/automl/apiv1/automlpb/geometry.pb.go
+++ b/automl/apiv1/automlpb/geometry.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/geometry.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/image.pb.go b/automl/apiv1/automlpb/image.pb.go
index 2ca6509c060..952a05cd2ce 100644
--- a/automl/apiv1/automlpb/image.pb.go
+++ b/automl/apiv1/automlpb/image.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/image.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/io.pb.go b/automl/apiv1/automlpb/io.pb.go
index baae601c134..92719d3e67c 100644
--- a/automl/apiv1/automlpb/io.pb.go
+++ b/automl/apiv1/automlpb/io.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/io.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/model.pb.go b/automl/apiv1/automlpb/model.pb.go
index a25d2df78e9..b5df885aba6 100644
--- a/automl/apiv1/automlpb/model.pb.go
+++ b/automl/apiv1/automlpb/model.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/model.proto
 
 package automlpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -121,9 +121,9 @@ type Model struct {
 	// come from the same ancestor project and location.
 	DatasetId string `protobuf:"bytes,3,opt,name=dataset_id,json=datasetId,proto3" json:"dataset_id,omitempty"`
 	// Output only. Timestamp when the model training finished  and can be used for prediction.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp when this model was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Deployment state of the model. A model can only serve
 	// prediction requests after it gets deployed.
 	DeploymentState Model_DeploymentState `protobuf:"varint,8,opt,name=deployment_state,json=deploymentState,proto3,enum=google.cloud.automl.v1.Model_DeploymentState" json:"deployment_state,omitempty"`
@@ -243,14 +243,14 @@ func (x *Model) GetDatasetId() string {
 	return ""
 }
 
-func (x *Model) GetCreateTime() *timestamp.Timestamp {
+func (x *Model) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Model) GetUpdateTime() *timestamp.Timestamp {
+func (x *Model) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -468,7 +468,7 @@ var file_google_cloud_automl_v1_model_proto_goTypes = []interface{}{
 	(*ImageObjectDetectionModelMetadata)(nil), // 6: google.cloud.automl.v1.ImageObjectDetectionModelMetadata
 	(*TextExtractionModelMetadata)(nil),       // 7: google.cloud.automl.v1.TextExtractionModelMetadata
 	(*TextSentimentModelMetadata)(nil),        // 8: google.cloud.automl.v1.TextSentimentModelMetadata
-	(*timestamp.Timestamp)(nil),               // 9: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),             // 9: google.protobuf.Timestamp
 }
 var file_google_cloud_automl_v1_model_proto_depIdxs = []int32{
 	3,  // 0: google.cloud.automl.v1.Model.translation_model_metadata:type_name -> google.cloud.automl.v1.TranslationModelMetadata
diff --git a/automl/apiv1/automlpb/model_evaluation.pb.go b/automl/apiv1/automlpb/model_evaluation.pb.go
index fdf3a360e42..55104b2fe30 100644
--- a/automl/apiv1/automlpb/model_evaluation.pb.go
+++ b/automl/apiv1/automlpb/model_evaluation.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/model_evaluation.proto
 
 package automlpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -78,7 +78,7 @@ type ModelEvaluation struct {
 	// The display_name is empty for the overall model evaluation.
 	DisplayName string `protobuf:"bytes,15,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only. Timestamp when this model evaluation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The number of examples used for model evaluation, i.e. for
 	// which ground truth from time of model creation is compared against the
 	// predicted annotations created by the model.
@@ -185,7 +185,7 @@ func (x *ModelEvaluation) GetDisplayName() string {
 	return ""
 }
 
-func (x *ModelEvaluation) GetCreateTime() *timestamp.Timestamp {
+func (x *ModelEvaluation) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -367,7 +367,7 @@ var file_google_cloud_automl_v1_model_evaluation_proto_goTypes = []interface{}{
 	(*ImageObjectDetectionEvaluationMetrics)(nil), // 3: google.cloud.automl.v1.ImageObjectDetectionEvaluationMetrics
 	(*TextSentimentEvaluationMetrics)(nil),        // 4: google.cloud.automl.v1.TextSentimentEvaluationMetrics
 	(*TextExtractionEvaluationMetrics)(nil),       // 5: google.cloud.automl.v1.TextExtractionEvaluationMetrics
-	(*timestamp.Timestamp)(nil),                   // 6: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                 // 6: google.protobuf.Timestamp
 }
 var file_google_cloud_automl_v1_model_evaluation_proto_depIdxs = []int32{
 	1, // 0: google.cloud.automl.v1.ModelEvaluation.classification_evaluation_metrics:type_name -> google.cloud.automl.v1.ClassificationEvaluationMetrics
diff --git a/automl/apiv1/automlpb/operations.pb.go b/automl/apiv1/automlpb/operations.pb.go
index e571a447db6..84415ba2cd4 100644
--- a/automl/apiv1/automlpb/operations.pb.go
+++ b/automl/apiv1/automlpb/operations.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/operations.proto
 
 package automlpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -67,9 +67,9 @@ type OperationMetadata struct {
 	// Status details field will contain standard GCP error details.
 	PartialFailures []*status.Status `protobuf:"bytes,2,rep,name=partial_failures,json=partialFailures,proto3" json:"partial_failures,omitempty"`
 	// Output only. Time when the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time when the operation was updated for the last time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *OperationMetadata) Reset() {
@@ -188,14 +188,14 @@ func (x *OperationMetadata) GetPartialFailures() []*status.Status {
 	return nil
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1053,7 +1053,7 @@ var file_google_cloud_automl_v1_operations_proto_goTypes = []interface{}{
 	(*BatchPredictOperationMetadata_BatchPredictOutputInfo)(nil), // 11: google.cloud.automl.v1.BatchPredictOperationMetadata.BatchPredictOutputInfo
 	(*ExportModelOperationMetadata_ExportModelOutputInfo)(nil),   // 12: google.cloud.automl.v1.ExportModelOperationMetadata.ExportModelOutputInfo
 	(*status.Status)(nil),                                        // 13: google.rpc.Status
-	(*timestamp.Timestamp)(nil),                                  // 14: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                                // 14: google.protobuf.Timestamp
 	(*BatchPredictInputConfig)(nil),                              // 15: google.cloud.automl.v1.BatchPredictInputConfig
 }
 var file_google_cloud_automl_v1_operations_proto_depIdxs = []int32{
diff --git a/automl/apiv1/automlpb/prediction_service.pb.go b/automl/apiv1/automlpb/prediction_service.pb.go
index a035e8e2e40..14ebb52ac93 100644
--- a/automl/apiv1/automlpb/prediction_service.pb.go
+++ b/automl/apiv1/automlpb/prediction_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/prediction_service.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/service.pb.go b/automl/apiv1/automlpb/service.pb.go
index ccddb57663d..17b99121fc6 100644
--- a/automl/apiv1/automlpb/service.pb.go
+++ b/automl/apiv1/automlpb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/service.proto
 
 package automlpb
@@ -27,12 +27,12 @@ import (
 
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -303,7 +303,7 @@ type UpdateDatasetRequest struct {
 	// Required. The dataset which replaces the resource on the server.
 	Dataset *Dataset `protobuf:"bytes,1,opt,name=dataset,proto3" json:"dataset,omitempty"`
 	// Required. The update mask applies to the resource.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateDatasetRequest) Reset() {
@@ -345,7 +345,7 @@ func (x *UpdateDatasetRequest) GetDataset() *Dataset {
 	return nil
 }
 
-func (x *UpdateDatasetRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDatasetRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -881,7 +881,7 @@ type UpdateModelRequest struct {
 	// Required. The model which replaces the resource on the server.
 	Model *Model `protobuf:"bytes,1,opt,name=model,proto3" json:"model,omitempty"`
 	// Required. The update mask applies to the resource.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateModelRequest) Reset() {
@@ -923,7 +923,7 @@ func (x *UpdateModelRequest) GetModel() *Model {
 	return nil
 }
 
-func (x *UpdateModelRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateModelRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1837,7 +1837,7 @@ var file_google_cloud_automl_v1_service_proto_goTypes = []interface{}{
 	(*ListModelEvaluationsRequest)(nil),                 // 19: google.cloud.automl.v1.ListModelEvaluationsRequest
 	(*ListModelEvaluationsResponse)(nil),                // 20: google.cloud.automl.v1.ListModelEvaluationsResponse
 	(*Dataset)(nil),                                     // 21: google.cloud.automl.v1.Dataset
-	(*field_mask.FieldMask)(nil),                        // 22: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                       // 22: google.protobuf.FieldMask
 	(*InputConfig)(nil),                                 // 23: google.cloud.automl.v1.InputConfig
 	(*OutputConfig)(nil),                                // 24: google.cloud.automl.v1.OutputConfig
 	(*Model)(nil),                                       // 25: google.cloud.automl.v1.Model
diff --git a/automl/apiv1/automlpb/text.pb.go b/automl/apiv1/automlpb/text.pb.go
index 2a2041552df..cd395cd131d 100644
--- a/automl/apiv1/automlpb/text.pb.go
+++ b/automl/apiv1/automlpb/text.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/text.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/text_extraction.pb.go b/automl/apiv1/automlpb/text_extraction.pb.go
index 753b9166f24..c994e1f680d 100644
--- a/automl/apiv1/automlpb/text_extraction.pb.go
+++ b/automl/apiv1/automlpb/text_extraction.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/text_extraction.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/text_segment.pb.go b/automl/apiv1/automlpb/text_segment.pb.go
index 4d7ac7f2d15..7c42086fb62 100644
--- a/automl/apiv1/automlpb/text_segment.pb.go
+++ b/automl/apiv1/automlpb/text_segment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/text_segment.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/text_sentiment.pb.go b/automl/apiv1/automlpb/text_sentiment.pb.go
index 64a5a8c33ce..96f6344ccee 100644
--- a/automl/apiv1/automlpb/text_sentiment.pb.go
+++ b/automl/apiv1/automlpb/text_sentiment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/text_sentiment.proto
 
 package automlpb
diff --git a/automl/apiv1/automlpb/translation.pb.go b/automl/apiv1/automlpb/translation.pb.go
index 0ec52972c5b..714e50bcecb 100644
--- a/automl/apiv1/automlpb/translation.pb.go
+++ b/automl/apiv1/automlpb/translation.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/automl/v1/translation.proto
 
 package automlpb
diff --git a/automl/apiv1/doc.go b/automl/apiv1/doc.go
index 7c61b79ec9e..4ed33405033 100644
--- a/automl/apiv1/doc.go
+++ b/automl/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &automlpb.PredictRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#PredictRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#PredictRequest.
 //	}
 //	resp, err := c.Predict(ctx, req)
 //	if err != nil {
diff --git a/automl/apiv1/prediction_client.go b/automl/apiv1/prediction_client.go
index 95d04d899e8..b8a203c14cc 100644
--- a/automl/apiv1/prediction_client.go
+++ b/automl/apiv1/prediction_client.go
@@ -23,13 +23,13 @@ import (
 	"net/url"
 	"time"
 
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/automl/apiv1/prediction_client_example_test.go b/automl/apiv1/prediction_client_example_test.go
index 53e14508875..8f2305046ad 100644
--- a/automl/apiv1/prediction_client_example_test.go
+++ b/automl/apiv1/prediction_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func ExampleNewPredictionClient() {
@@ -55,7 +55,7 @@ func ExamplePredictionClient_Predict() {
 
 	req := &automlpb.PredictRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#PredictRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#PredictRequest.
 	}
 	resp, err := c.Predict(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExamplePredictionClient_BatchPredict() {
 
 	req := &automlpb.BatchPredictRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#BatchPredictRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#BatchPredictRequest.
 	}
 	op, err := c.BatchPredict(ctx, req)
 	if err != nil {
diff --git a/automl/go.mod b/automl/go.mod
index 11a628c156f..526e7521b98 100644
--- a/automl/go.mod
+++ b/automl/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/automl
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/automl/go.sum b/automl/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/automl/go.sum
+++ b/automl/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/baremetalsolution/aliasshim/aliasshim.go b/baremetalsolution/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/baremetalsolution/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/baremetalsolution/apiv2/bare_metal_solution_client.go b/baremetalsolution/apiv2/bare_metal_solution_client.go
index 79dfc20d373..4158783a73e 100644
--- a/baremetalsolution/apiv2/bare_metal_solution_client.go
+++ b/baremetalsolution/apiv2/bare_metal_solution_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/baremetalsolution/apiv2/bare_metal_solution_client_example_test.go b/baremetalsolution/apiv2/bare_metal_solution_client_example_test.go
index bb901f6b559..2e13fa20617 100644
--- a/baremetalsolution/apiv2/bare_metal_solution_client_example_test.go
+++ b/baremetalsolution/apiv2/bare_metal_solution_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 	"google.golang.org/api/iterator"
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 )
 
@@ -57,7 +57,7 @@ func ExampleClient_ListInstances() {
 
 	req := &baremetalsolutionpb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleClient_GetInstance() {
 
 	req := &baremetalsolutionpb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleClient_UpdateInstance() {
 
 	req := &baremetalsolutionpb.UpdateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#UpdateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#UpdateInstanceRequest.
 	}
 	op, err := c.UpdateInstance(ctx, req)
 	if err != nil {
@@ -143,7 +143,7 @@ func ExampleClient_ResetInstance() {
 
 	req := &baremetalsolutionpb.ResetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ResetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ResetInstanceRequest.
 	}
 	op, err := c.ResetInstance(ctx, req)
 	if err != nil {
@@ -173,7 +173,7 @@ func ExampleClient_StartInstance() {
 
 	req := &baremetalsolutionpb.StartInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#StartInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#StartInstanceRequest.
 	}
 	op, err := c.StartInstance(ctx, req)
 	if err != nil {
@@ -203,7 +203,7 @@ func ExampleClient_StopInstance() {
 
 	req := &baremetalsolutionpb.StopInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#StopInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#StopInstanceRequest.
 	}
 	op, err := c.StopInstance(ctx, req)
 	if err != nil {
@@ -233,7 +233,7 @@ func ExampleClient_DetachLun() {
 
 	req := &baremetalsolutionpb.DetachLunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#DetachLunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#DetachLunRequest.
 	}
 	op, err := c.DetachLun(ctx, req)
 	if err != nil {
@@ -263,7 +263,7 @@ func ExampleClient_ListVolumes() {
 
 	req := &baremetalsolutionpb.ListVolumesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListVolumesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListVolumesRequest.
 	}
 	it := c.ListVolumes(ctx, req)
 	for {
@@ -294,7 +294,7 @@ func ExampleClient_GetVolume() {
 
 	req := &baremetalsolutionpb.GetVolumeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetVolumeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetVolumeRequest.
 	}
 	resp, err := c.GetVolume(ctx, req)
 	if err != nil {
@@ -319,7 +319,7 @@ func ExampleClient_UpdateVolume() {
 
 	req := &baremetalsolutionpb.UpdateVolumeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#UpdateVolumeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#UpdateVolumeRequest.
 	}
 	op, err := c.UpdateVolume(ctx, req)
 	if err != nil {
@@ -349,7 +349,7 @@ func ExampleClient_ResizeVolume() {
 
 	req := &baremetalsolutionpb.ResizeVolumeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ResizeVolumeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ResizeVolumeRequest.
 	}
 	op, err := c.ResizeVolume(ctx, req)
 	if err != nil {
@@ -379,7 +379,7 @@ func ExampleClient_ListNetworks() {
 
 	req := &baremetalsolutionpb.ListNetworksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListNetworksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListNetworksRequest.
 	}
 	it := c.ListNetworks(ctx, req)
 	for {
@@ -410,7 +410,7 @@ func ExampleClient_ListNetworkUsage() {
 
 	req := &baremetalsolutionpb.ListNetworkUsageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListNetworkUsageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListNetworkUsageRequest.
 	}
 	resp, err := c.ListNetworkUsage(ctx, req)
 	if err != nil {
@@ -435,7 +435,7 @@ func ExampleClient_GetNetwork() {
 
 	req := &baremetalsolutionpb.GetNetworkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetNetworkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetNetworkRequest.
 	}
 	resp, err := c.GetNetwork(ctx, req)
 	if err != nil {
@@ -460,7 +460,7 @@ func ExampleClient_UpdateNetwork() {
 
 	req := &baremetalsolutionpb.UpdateNetworkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#UpdateNetworkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#UpdateNetworkRequest.
 	}
 	op, err := c.UpdateNetwork(ctx, req)
 	if err != nil {
@@ -490,7 +490,7 @@ func ExampleClient_GetLun() {
 
 	req := &baremetalsolutionpb.GetLunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetLunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetLunRequest.
 	}
 	resp, err := c.GetLun(ctx, req)
 	if err != nil {
@@ -515,7 +515,7 @@ func ExampleClient_ListLuns() {
 
 	req := &baremetalsolutionpb.ListLunsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListLunsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListLunsRequest.
 	}
 	it := c.ListLuns(ctx, req)
 	for {
@@ -546,7 +546,7 @@ func ExampleClient_GetNfsShare() {
 
 	req := &baremetalsolutionpb.GetNfsShareRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetNfsShareRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetNfsShareRequest.
 	}
 	resp, err := c.GetNfsShare(ctx, req)
 	if err != nil {
@@ -571,7 +571,7 @@ func ExampleClient_ListNfsShares() {
 
 	req := &baremetalsolutionpb.ListNfsSharesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListNfsSharesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListNfsSharesRequest.
 	}
 	it := c.ListNfsShares(ctx, req)
 	for {
@@ -602,7 +602,7 @@ func ExampleClient_UpdateNfsShare() {
 
 	req := &baremetalsolutionpb.UpdateNfsShareRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#UpdateNfsShareRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#UpdateNfsShareRequest.
 	}
 	op, err := c.UpdateNfsShare(ctx, req)
 	if err != nil {
diff --git a/baremetalsolution/apiv2/baremetalsolutionpb/baremetalsolution.pb.go b/baremetalsolution/apiv2/baremetalsolutionpb/baremetalsolution.pb.go
index 9bdc55cda9e..506514b5620 100644
--- a/baremetalsolution/apiv2/baremetalsolutionpb/baremetalsolution.pb.go
+++ b/baremetalsolution/apiv2/baremetalsolutionpb/baremetalsolution.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/baremetalsolution/v2/baremetalsolution.proto
 
 package baremetalsolutionpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -49,9 +49,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Name of the action executed by the operation.
@@ -99,14 +99,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_baremetalsolution_v2_baremetalsolution_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -541,7 +541,7 @@ var file_google_cloud_baremetalsolution_v2_baremetalsolution_proto_msgTypes = ma
 var file_google_cloud_baremetalsolution_v2_baremetalsolution_proto_goTypes = []interface{}{
 	(*OperationMetadata)(nil),        // 0: google.cloud.baremetalsolution.v2.OperationMetadata
 	(*ResetInstanceResponse)(nil),    // 1: google.cloud.baremetalsolution.v2.ResetInstanceResponse
-	(*timestamp.Timestamp)(nil),      // 2: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),    // 2: google.protobuf.Timestamp
 	(*ListInstancesRequest)(nil),     // 3: google.cloud.baremetalsolution.v2.ListInstancesRequest
 	(*GetInstanceRequest)(nil),       // 4: google.cloud.baremetalsolution.v2.GetInstanceRequest
 	(*UpdateInstanceRequest)(nil),    // 5: google.cloud.baremetalsolution.v2.UpdateInstanceRequest
diff --git a/baremetalsolution/apiv2/baremetalsolutionpb/instance.pb.go b/baremetalsolution/apiv2/baremetalsolutionpb/instance.pb.go
index 6ce849c4892..1509afd3eae 100644
--- a/baremetalsolution/apiv2/baremetalsolutionpb/instance.pb.go
+++ b/baremetalsolution/apiv2/baremetalsolutionpb/instance.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/baremetalsolution/v2/instance.proto
 
 package baremetalsolutionpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -163,9 +163,9 @@ type Instance struct {
 	// An identifier for the `Instance`, generated by the backend.
 	Id string `protobuf:"bytes,11,opt,name=id,proto3" json:"id,omitempty"`
 	// Output only. Create a time stamp.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Update a time stamp.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The server type.
 	// [Available server
 	// types](https://cloud.google.com/bare-metal/docs/bms-planning#server_configurations)
@@ -252,14 +252,14 @@ func (x *Instance) GetId() string {
 	return ""
 }
 
-func (x *Instance) GetCreateTime() *timestamp.Timestamp {
+func (x *Instance) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Instance) GetUpdateTime() *timestamp.Timestamp {
+func (x *Instance) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -553,7 +553,7 @@ type UpdateInstanceRequest struct {
 	//	`labels`
 	//	`hyperthreading_enabled`
 	//	`os_image`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateInstanceRequest) Reset() {
@@ -595,7 +595,7 @@ func (x *UpdateInstanceRequest) GetInstance() *Instance {
 	return nil
 }
 
-func (x *UpdateInstanceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateInstanceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1278,11 +1278,11 @@ var file_google_cloud_baremetalsolution_v2_instance_proto_goTypes = []interface{
 	(*StopInstanceResponse)(nil),                   // 13: google.cloud.baremetalsolution.v2.StopInstanceResponse
 	nil,                                            // 14: google.cloud.baremetalsolution.v2.Instance.LabelsEntry
 	(*ServerNetworkTemplate_LogicalInterface)(nil), // 15: google.cloud.baremetalsolution.v2.ServerNetworkTemplate.LogicalInterface
-	(*timestamp.Timestamp)(nil),                    // 16: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                  // 16: google.protobuf.Timestamp
 	(*Lun)(nil),                                    // 17: google.cloud.baremetalsolution.v2.Lun
 	(*Network)(nil),                                // 18: google.cloud.baremetalsolution.v2.Network
 	(*LogicalInterface)(nil),                       // 19: google.cloud.baremetalsolution.v2.LogicalInterface
-	(*field_mask.FieldMask)(nil),                   // 20: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                  // 20: google.protobuf.FieldMask
 }
 var file_google_cloud_baremetalsolution_v2_instance_proto_depIdxs = []int32{
 	16, // 0: google.cloud.baremetalsolution.v2.Instance.create_time:type_name -> google.protobuf.Timestamp
diff --git a/baremetalsolution/apiv2/baremetalsolutionpb/lun.pb.go b/baremetalsolution/apiv2/baremetalsolutionpb/lun.pb.go
index 5d902a3f1c0..ffd5f14a8da 100644
--- a/baremetalsolution/apiv2/baremetalsolutionpb/lun.pb.go
+++ b/baremetalsolution/apiv2/baremetalsolutionpb/lun.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/baremetalsolution/v2/lun.proto
 
 package baremetalsolutionpb
diff --git a/baremetalsolution/apiv2/baremetalsolutionpb/network.pb.go b/baremetalsolution/apiv2/baremetalsolutionpb/network.pb.go
index 134764a1e0a..9fe433833ce 100644
--- a/baremetalsolution/apiv2/baremetalsolutionpb/network.pb.go
+++ b/baremetalsolution/apiv2/baremetalsolutionpb/network.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/baremetalsolution/v2/network.proto
 
 package baremetalsolutionpb
@@ -25,9 +25,9 @@ import (
 	sync "sync"
 
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -777,7 +777,7 @@ type UpdateNetworkRequest struct {
 	// The only currently supported fields are:
 	//
 	//	`labels`, `reservations`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateNetworkRequest) Reset() {
@@ -819,7 +819,7 @@ func (x *UpdateNetworkRequest) GetNetwork() *Network {
 	return nil
 }
 
-func (x *UpdateNetworkRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateNetworkRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1428,7 +1428,7 @@ var file_google_cloud_baremetalsolution_v2_network_proto_goTypes = []interface{}
 	(*VRF_QosPolicy)(nil),                            // 15: google.cloud.baremetalsolution.v2.VRF.QosPolicy
 	(*VRF_VlanAttachment)(nil),                       // 16: google.cloud.baremetalsolution.v2.VRF.VlanAttachment
 	(*LogicalInterface_LogicalNetworkInterface)(nil), // 17: google.cloud.baremetalsolution.v2.LogicalInterface.LogicalNetworkInterface
-	(*field_mask.FieldMask)(nil),                     // 18: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                    // 18: google.protobuf.FieldMask
 }
 var file_google_cloud_baremetalsolution_v2_network_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.baremetalsolution.v2.Network.type:type_name -> google.cloud.baremetalsolution.v2.Network.Type
diff --git a/baremetalsolution/apiv2/baremetalsolutionpb/nfs_share.pb.go b/baremetalsolution/apiv2/baremetalsolutionpb/nfs_share.pb.go
index 4c5126c453c..c9393e7d626 100644
--- a/baremetalsolution/apiv2/baremetalsolutionpb/nfs_share.pb.go
+++ b/baremetalsolution/apiv2/baremetalsolutionpb/nfs_share.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/baremetalsolution/v2/nfs_share.proto
 
 package baremetalsolutionpb
@@ -25,9 +25,9 @@ import (
 	sync "sync"
 
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -441,7 +441,7 @@ type UpdateNfsShareRequest struct {
 	// The only currently supported fields are:
 	//
 	//	`labels`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateNfsShareRequest) Reset() {
@@ -483,7 +483,7 @@ func (x *UpdateNfsShareRequest) GetNfsShare() *NfsShare {
 	return nil
 }
 
-func (x *UpdateNfsShareRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateNfsShareRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -757,7 +757,7 @@ var file_google_cloud_baremetalsolution_v2_nfs_share_proto_goTypes = []interface
 	(*UpdateNfsShareRequest)(nil),  // 6: google.cloud.baremetalsolution.v2.UpdateNfsShareRequest
 	(*NfsShare_AllowedClient)(nil), // 7: google.cloud.baremetalsolution.v2.NfsShare.AllowedClient
 	nil,                            // 8: google.cloud.baremetalsolution.v2.NfsShare.LabelsEntry
-	(*field_mask.FieldMask)(nil),   // 9: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),  // 9: google.protobuf.FieldMask
 }
 var file_google_cloud_baremetalsolution_v2_nfs_share_proto_depIdxs = []int32{
 	0, // 0: google.cloud.baremetalsolution.v2.NfsShare.state:type_name -> google.cloud.baremetalsolution.v2.NfsShare.State
diff --git a/baremetalsolution/apiv2/baremetalsolutionpb/volume.pb.go b/baremetalsolution/apiv2/baremetalsolutionpb/volume.pb.go
index ab3a89922d8..780c358241e 100644
--- a/baremetalsolution/apiv2/baremetalsolutionpb/volume.pb.go
+++ b/baremetalsolution/apiv2/baremetalsolutionpb/volume.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/baremetalsolution/v2/volume.proto
 
 package baremetalsolutionpb
@@ -25,9 +25,9 @@ import (
 	sync "sync"
 
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -593,7 +593,7 @@ type UpdateVolumeRequest struct {
 	//	'labels'
 	//	'snapshot_enabled'
 	//	'snapshot_reservation_detail.reserved_space_percent'
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateVolumeRequest) Reset() {
@@ -635,7 +635,7 @@ func (x *UpdateVolumeRequest) GetVolume() *Volume {
 	return nil
 }
 
-func (x *UpdateVolumeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateVolumeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -983,7 +983,7 @@ var file_google_cloud_baremetalsolution_v2_volume_proto_goTypes = []interface{}{
 	(*ResizeVolumeRequest)(nil),              // 8: google.cloud.baremetalsolution.v2.ResizeVolumeRequest
 	(*Volume_SnapshotReservationDetail)(nil), // 9: google.cloud.baremetalsolution.v2.Volume.SnapshotReservationDetail
 	nil,                                      // 10: google.cloud.baremetalsolution.v2.Volume.LabelsEntry
-	(*field_mask.FieldMask)(nil),             // 11: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),            // 11: google.protobuf.FieldMask
 }
 var file_google_cloud_baremetalsolution_v2_volume_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.baremetalsolution.v2.Volume.storage_type:type_name -> google.cloud.baremetalsolution.v2.Volume.StorageType
diff --git a/baremetalsolution/apiv2/doc.go b/baremetalsolution/apiv2/doc.go
index f08e2879a4b..63d87c7c880 100644
--- a/baremetalsolution/apiv2/doc.go
+++ b/baremetalsolution/apiv2/doc.go
@@ -60,7 +60,7 @@
 //
 //	req := &baremetalsolutionpb.ListInstancesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListInstancesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListInstancesRequest.
 //	}
 //	it := c.ListInstances(ctx, req)
 //	for {
diff --git a/baremetalsolution/go.mod b/baremetalsolution/go.mod
index 3ffdd5bb8bf..3673f170d3d 100644
--- a/baremetalsolution/go.mod
+++ b/baremetalsolution/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/baremetalsolution
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/baremetalsolution/go.sum b/baremetalsolution/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/baremetalsolution/go.sum
+++ b/baremetalsolution/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/batch/aliasshim/aliasshim.go b/batch/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/batch/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/batch/apiv1/batch_client.go b/batch/apiv1/batch_client.go
index 5cf0a245036..183019e4d07 100644
--- a/batch/apiv1/batch_client.go
+++ b/batch/apiv1/batch_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	batchpb "cloud.google.com/go/batch/apiv1/batchpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	batchpb "google.golang.org/genproto/googleapis/cloud/batch/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/batch/apiv1/batch_client_example_test.go b/batch/apiv1/batch_client_example_test.go
index a0b1e37bd1b..1ddcc9a896b 100644
--- a/batch/apiv1/batch_client_example_test.go
+++ b/batch/apiv1/batch_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	batch "cloud.google.com/go/batch/apiv1"
+	batchpb "cloud.google.com/go/batch/apiv1/batchpb"
 	"google.golang.org/api/iterator"
-	batchpb "google.golang.org/genproto/googleapis/cloud/batch/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleClient_CreateJob() {
 
 	req := &batchpb.CreateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#CreateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#CreateJobRequest.
 	}
 	resp, err := c.CreateJob(ctx, req)
 	if err != nil {
@@ -84,7 +84,7 @@ func ExampleClient_GetJob() {
 
 	req := &batchpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
@@ -109,7 +109,7 @@ func ExampleClient_DeleteJob() {
 
 	req := &batchpb.DeleteJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#DeleteJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#DeleteJobRequest.
 	}
 	op, err := c.DeleteJob(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleClient_ListJobs() {
 
 	req := &batchpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
@@ -168,7 +168,7 @@ func ExampleClient_GetTask() {
 
 	req := &batchpb.GetTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#GetTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#GetTaskRequest.
 	}
 	resp, err := c.GetTask(ctx, req)
 	if err != nil {
@@ -193,7 +193,7 @@ func ExampleClient_ListTasks() {
 
 	req := &batchpb.ListTasksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#ListTasksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#ListTasksRequest.
 	}
 	it := c.ListTasks(ctx, req)
 	for {
diff --git a/batch/apiv1/batchpb/batch.pb.go b/batch/apiv1/batchpb/batch.pb.go
index af0ee436445..332ece86c85 100644
--- a/batch/apiv1/batchpb/batch.pb.go
+++ b/batch/apiv1/batchpb/batch.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/batch/v1/batch.proto
 
 package batchpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -612,9 +612,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -662,14 +662,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_batch_v1_batch_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -926,7 +926,7 @@ var file_google_cloud_batch_v1_batch_proto_goTypes = []interface{}{
 	(*OperationMetadata)(nil),     // 8: google.cloud.batch.v1.OperationMetadata
 	(*Job)(nil),                   // 9: google.cloud.batch.v1.Job
 	(*Task)(nil),                  // 10: google.cloud.batch.v1.Task
-	(*timestamp.Timestamp)(nil),   // 11: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil), // 12: google.longrunning.Operation
 }
 var file_google_cloud_batch_v1_batch_proto_depIdxs = []int32{
diff --git a/batch/apiv1/batchpb/job.pb.go b/batch/apiv1/batchpb/job.pb.go
index 93bfe70b73a..bbeebb892fa 100644
--- a/batch/apiv1/batchpb/job.pb.go
+++ b/batch/apiv1/batchpb/job.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/batch/v1/job.proto
 
 package batchpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -314,9 +314,9 @@ type Job struct {
 	// Output only. Job status. It is read only for users.
 	Status *JobStatus `protobuf:"bytes,9,opt,name=status,proto3" json:"status,omitempty"`
 	// Output only. When the Job was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last time the Job was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Log preservation policy for the Job.
 	LogsPolicy *LogsPolicy `protobuf:"bytes,13,opt,name=logs_policy,json=logsPolicy,proto3" json:"logs_policy,omitempty"`
 	// Notification configurations.
@@ -404,14 +404,14 @@ func (x *Job) GetStatus() *JobStatus {
 	return nil
 }
 
-func (x *Job) GetCreateTime() *timestamp.Timestamp {
+func (x *Job) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Job) GetUpdateTime() *timestamp.Timestamp {
+func (x *Job) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -507,7 +507,7 @@ type JobStatus struct {
 	// The map key is TaskGroup ID.
 	TaskGroups map[string]*JobStatus_TaskGroupStatus `protobuf:"bytes,4,rep,name=task_groups,json=taskGroups,proto3" json:"task_groups,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The duration of time that the Job spent in status RUNNING.
-	RunDuration *duration.Duration `protobuf:"bytes,5,opt,name=run_duration,json=runDuration,proto3" json:"run_duration,omitempty"`
+	RunDuration *durationpb.Duration `protobuf:"bytes,5,opt,name=run_duration,json=runDuration,proto3" json:"run_duration,omitempty"`
 }
 
 func (x *JobStatus) Reset() {
@@ -563,7 +563,7 @@ func (x *JobStatus) GetTaskGroups() map[string]*JobStatus_TaskGroupStatus {
 	return nil
 }
 
-func (x *JobStatus) GetRunDuration() *duration.Duration {
+func (x *JobStatus) GetRunDuration() *durationpb.Duration {
 	if x != nil {
 		return x.RunDuration
 	}
@@ -2144,9 +2144,9 @@ var file_google_cloud_batch_v1_job_proto_goTypes = []interface{}{
 	(*AllocationPolicy_NetworkInterface)(nil),         // 23: google.cloud.batch.v1.AllocationPolicy.NetworkInterface
 	(*AllocationPolicy_NetworkPolicy)(nil),            // 24: google.cloud.batch.v1.AllocationPolicy.NetworkPolicy
 	nil,                                               // 25: google.cloud.batch.v1.AllocationPolicy.LabelsEntry
-	(*timestamp.Timestamp)(nil),                       // 26: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                     // 26: google.protobuf.Timestamp
 	(*StatusEvent)(nil),                               // 27: google.cloud.batch.v1.StatusEvent
-	(*duration.Duration)(nil),                         // 28: google.protobuf.Duration
+	(*durationpb.Duration)(nil),                       // 28: google.protobuf.Duration
 	(*TaskSpec)(nil),                                  // 29: google.cloud.batch.v1.TaskSpec
 	(*Environment)(nil),                               // 30: google.cloud.batch.v1.Environment
 	(TaskStatus_State)(0),                             // 31: google.cloud.batch.v1.TaskStatus.State
diff --git a/batch/apiv1/batchpb/task.pb.go b/batch/apiv1/batchpb/task.pb.go
index c777c4a328d..0f88ec45e99 100644
--- a/batch/apiv1/batchpb/task.pb.go
+++ b/batch/apiv1/batchpb/task.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/batch/v1/task.proto
 
 package batchpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -234,7 +234,7 @@ type StatusEvent struct {
 	// Description of the event.
 	Description string `protobuf:"bytes,1,opt,name=description,proto3" json:"description,omitempty"`
 	// The time this event occurred.
-	EventTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
+	EventTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
 	// Task Execution
 	TaskExecution *TaskExecution `protobuf:"bytes,4,opt,name=task_execution,json=taskExecution,proto3" json:"task_execution,omitempty"`
 }
@@ -285,7 +285,7 @@ func (x *StatusEvent) GetDescription() string {
 	return ""
 }
 
-func (x *StatusEvent) GetEventTime() *timestamp.Timestamp {
+func (x *StatusEvent) GetEventTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EventTime
 	}
@@ -443,7 +443,7 @@ type Runnable struct {
 	// whole Task or TaskGroup).
 	Environment *Environment `protobuf:"bytes,7,opt,name=environment,proto3" json:"environment,omitempty"`
 	// Timeout for this Runnable.
-	Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
 }
 
 func (x *Runnable) Reset() {
@@ -534,7 +534,7 @@ func (x *Runnable) GetEnvironment() *Environment {
 	return nil
 }
 
-func (x *Runnable) GetTimeout() *duration.Duration {
+func (x *Runnable) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -587,7 +587,7 @@ type TaskSpec struct {
 	ComputeResource *ComputeResource `protobuf:"bytes,3,opt,name=compute_resource,json=computeResource,proto3" json:"compute_resource,omitempty"`
 	// Maximum duration the task should run.
 	// The task will be killed and marked as FAILED if over this limit.
-	MaxRunDuration *duration.Duration `protobuf:"bytes,4,opt,name=max_run_duration,json=maxRunDuration,proto3" json:"max_run_duration,omitempty"`
+	MaxRunDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=max_run_duration,json=maxRunDuration,proto3" json:"max_run_duration,omitempty"`
 	// Maximum number of retries on failures.
 	// The default, 0, which means never retry.
 	// The valid value range is [0, 10].
@@ -659,7 +659,7 @@ func (x *TaskSpec) GetComputeResource() *ComputeResource {
 	return nil
 }
 
-func (x *TaskSpec) GetMaxRunDuration() *duration.Duration {
+func (x *TaskSpec) GetMaxRunDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MaxRunDuration
 	}
@@ -1414,8 +1414,8 @@ var file_google_cloud_batch_v1_task_proto_goTypes = []interface{}{
 	nil,                                     // 14: google.cloud.batch.v1.TaskSpec.EnvironmentsEntry
 	(*LifecyclePolicy_ActionCondition)(nil), // 15: google.cloud.batch.v1.LifecyclePolicy.ActionCondition
 	nil,                                     // 16: google.cloud.batch.v1.Environment.VariablesEntry
-	(*timestamp.Timestamp)(nil),             // 17: google.protobuf.Timestamp
-	(*duration.Duration)(nil),               // 18: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),           // 17: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),             // 18: google.protobuf.Duration
 	(*Volume)(nil),                          // 19: google.cloud.batch.v1.Volume
 }
 var file_google_cloud_batch_v1_task_proto_depIdxs = []int32{
diff --git a/batch/apiv1/batchpb/volume.pb.go b/batch/apiv1/batchpb/volume.pb.go
index 85c741c6ba8..dab0ddb1c1a 100644
--- a/batch/apiv1/batchpb/volume.pb.go
+++ b/batch/apiv1/batchpb/volume.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/batch/v1/volume.proto
 
 package batchpb
diff --git a/batch/apiv1/doc.go b/batch/apiv1/doc.go
index fb5d8c3b888..29f81285956 100644
--- a/batch/apiv1/doc.go
+++ b/batch/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &batchpb.CreateJobRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#CreateJobRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#CreateJobRequest.
 //	}
 //	resp, err := c.CreateJob(ctx, req)
 //	if err != nil {
diff --git a/batch/go.mod b/batch/go.mod
index c7aa507de63..a4cff81d152 100644
--- a/batch/go.mod
+++ b/batch/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/batch
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/batch/go.sum b/batch/go.sum
index 4b329766226..197b62f3d3c 100644
--- a/batch/go.sum
+++ b/batch/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a h1:GH6UPn3ixhWcKDhpnEC55S75cerLPdpp3hrhfKYjZgw=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/beyondcorp/aliasshim/aliasshim.go b/beyondcorp/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/beyondcorp/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/beyondcorp/appconnections/apiv1/app_connections_client.go b/beyondcorp/appconnections/apiv1/app_connections_client.go
index 2a6cc0e1757..f7a21c0bd0d 100644
--- a/beyondcorp/appconnections/apiv1/app_connections_client.go
+++ b/beyondcorp/appconnections/apiv1/app_connections_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	appconnectionspb "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appconnectionspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/beyondcorp/appconnections/apiv1/app_connections_client_example_test.go b/beyondcorp/appconnections/apiv1/app_connections_client_example_test.go
index d6c263f8e7a..2e8fc59a3a4 100644
--- a/beyondcorp/appconnections/apiv1/app_connections_client_example_test.go
+++ b/beyondcorp/appconnections/apiv1/app_connections_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appconnections "cloud.google.com/go/beyondcorp/appconnections/apiv1"
+	appconnectionspb "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb"
 	"google.golang.org/api/iterator"
-	appconnectionspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleClient_ListAppConnections() {
 
 	req := &appconnectionspb.ListAppConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#ListAppConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#ListAppConnectionsRequest.
 	}
 	it := c.ListAppConnections(ctx, req)
 	for {
@@ -90,7 +90,7 @@ func ExampleClient_GetAppConnection() {
 
 	req := &appconnectionspb.GetAppConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#GetAppConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#GetAppConnectionRequest.
 	}
 	resp, err := c.GetAppConnection(ctx, req)
 	if err != nil {
@@ -115,7 +115,7 @@ func ExampleClient_CreateAppConnection() {
 
 	req := &appconnectionspb.CreateAppConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#CreateAppConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#CreateAppConnectionRequest.
 	}
 	op, err := c.CreateAppConnection(ctx, req)
 	if err != nil {
@@ -145,7 +145,7 @@ func ExampleClient_UpdateAppConnection() {
 
 	req := &appconnectionspb.UpdateAppConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#UpdateAppConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#UpdateAppConnectionRequest.
 	}
 	op, err := c.UpdateAppConnection(ctx, req)
 	if err != nil {
@@ -175,7 +175,7 @@ func ExampleClient_DeleteAppConnection() {
 
 	req := &appconnectionspb.DeleteAppConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#DeleteAppConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#DeleteAppConnectionRequest.
 	}
 	op, err := c.DeleteAppConnection(ctx, req)
 	if err != nil {
@@ -203,7 +203,7 @@ func ExampleClient_ResolveAppConnections() {
 
 	req := &appconnectionspb.ResolveAppConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#ResolveAppConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#ResolveAppConnectionsRequest.
 	}
 	it := c.ResolveAppConnections(ctx, req)
 	for {
diff --git a/beyondcorp/appconnections/apiv1/appconnectionspb/app_connections_service.pb.go b/beyondcorp/appconnections/apiv1/appconnectionspb/app_connections_service.pb.go
index 21111f4b6ac..8209af89d5d 100644
--- a/beyondcorp/appconnections/apiv1/appconnectionspb/app_connections_service.pb.go
+++ b/beyondcorp/appconnections/apiv1/appconnectionspb/app_connections_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/beyondcorp/appconnections/v1/app_connections_service.proto
 
 package appconnectionspb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -537,7 +537,7 @@ type UpdateAppConnectionRequest struct {
 	// * `display_name`
 	// * `application_endpoint`
 	// * `connectors`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. AppConnection message with updated fields. Only supported fields
 	// specified in update_mask are updated.
 	AppConnection *AppConnection `protobuf:"bytes,2,opt,name=app_connection,json=appConnection,proto3" json:"app_connection,omitempty"`
@@ -594,7 +594,7 @@ func (*UpdateAppConnectionRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_beyondcorp_appconnections_v1_app_connections_service_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *UpdateAppConnectionRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAppConnectionRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -876,9 +876,9 @@ type AppConnection struct {
 	// The name is ignored when creating a AppConnection.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. Timestamp when the resource was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp when the resource was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Resource labels to represent user provided metadata.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. An arbitrary user-provided name for the AppConnection. Cannot
@@ -940,14 +940,14 @@ func (x *AppConnection) GetName() string {
 	return ""
 }
 
-func (x *AppConnection) GetCreateTime() *timestamp.Timestamp {
+func (x *AppConnection) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AppConnection) GetUpdateTime() *timestamp.Timestamp {
+func (x *AppConnection) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1017,9 +1017,9 @@ type AppConnectionOperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -1068,14 +1068,14 @@ func (*AppConnectionOperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_beyondcorp_appconnections_v1_app_connections_service_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *AppConnectionOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *AppConnectionOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AppConnectionOperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *AppConnectionOperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1750,8 +1750,8 @@ var file_google_cloud_beyondcorp_appconnections_v1_app_connections_service_proto
 	(*AppConnection_ApplicationEndpoint)(nil),                  // 14: google.cloud.beyondcorp.appconnections.v1.AppConnection.ApplicationEndpoint
 	(*AppConnection_Gateway)(nil),                              // 15: google.cloud.beyondcorp.appconnections.v1.AppConnection.Gateway
 	nil,                                                        // 16: google.cloud.beyondcorp.appconnections.v1.AppConnection.LabelsEntry
-	(*field_mask.FieldMask)(nil),                               // 17: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),                                // 18: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                              // 17: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                              // 18: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),                              // 19: google.longrunning.Operation
 }
 var file_google_cloud_beyondcorp_appconnections_v1_app_connections_service_proto_depIdxs = []int32{
diff --git a/beyondcorp/appconnections/apiv1/doc.go b/beyondcorp/appconnections/apiv1/doc.go
index 50eb3974972..ff95100cb2e 100644
--- a/beyondcorp/appconnections/apiv1/doc.go
+++ b/beyondcorp/appconnections/apiv1/doc.go
@@ -62,7 +62,7 @@
 //
 //	req := &appconnectionspb.ListAppConnectionsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#ListAppConnectionsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#ListAppConnectionsRequest.
 //	}
 //	it := c.ListAppConnections(ctx, req)
 //	for {
diff --git a/beyondcorp/appconnectors/apiv1/app_connectors_client.go b/beyondcorp/appconnectors/apiv1/app_connectors_client.go
index 3f915e8b829..7259aa593c8 100644
--- a/beyondcorp/appconnectors/apiv1/app_connectors_client.go
+++ b/beyondcorp/appconnectors/apiv1/app_connectors_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	appconnectorspb "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appconnectorspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/beyondcorp/appconnectors/apiv1/app_connectors_client_example_test.go b/beyondcorp/appconnectors/apiv1/app_connectors_client_example_test.go
index 66ec180331b..78eb443d6be 100644
--- a/beyondcorp/appconnectors/apiv1/app_connectors_client_example_test.go
+++ b/beyondcorp/appconnectors/apiv1/app_connectors_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appconnectors "cloud.google.com/go/beyondcorp/appconnectors/apiv1"
+	appconnectorspb "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb"
 	"google.golang.org/api/iterator"
-	appconnectorspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleClient_ListAppConnectors() {
 
 	req := &appconnectorspb.ListAppConnectorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#ListAppConnectorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#ListAppConnectorsRequest.
 	}
 	it := c.ListAppConnectors(ctx, req)
 	for {
@@ -90,7 +90,7 @@ func ExampleClient_GetAppConnector() {
 
 	req := &appconnectorspb.GetAppConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#GetAppConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#GetAppConnectorRequest.
 	}
 	resp, err := c.GetAppConnector(ctx, req)
 	if err != nil {
@@ -115,7 +115,7 @@ func ExampleClient_CreateAppConnector() {
 
 	req := &appconnectorspb.CreateAppConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#CreateAppConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#CreateAppConnectorRequest.
 	}
 	op, err := c.CreateAppConnector(ctx, req)
 	if err != nil {
@@ -145,7 +145,7 @@ func ExampleClient_UpdateAppConnector() {
 
 	req := &appconnectorspb.UpdateAppConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#UpdateAppConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#UpdateAppConnectorRequest.
 	}
 	op, err := c.UpdateAppConnector(ctx, req)
 	if err != nil {
@@ -175,7 +175,7 @@ func ExampleClient_DeleteAppConnector() {
 
 	req := &appconnectorspb.DeleteAppConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#DeleteAppConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#DeleteAppConnectorRequest.
 	}
 	op, err := c.DeleteAppConnector(ctx, req)
 	if err != nil {
@@ -203,7 +203,7 @@ func ExampleClient_ReportStatus() {
 
 	req := &appconnectorspb.ReportStatusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#ReportStatusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#ReportStatusRequest.
 	}
 	op, err := c.ReportStatus(ctx, req)
 	if err != nil {
diff --git a/beyondcorp/appconnectors/apiv1/appconnectorspb/app_connector_instance_config.pb.go b/beyondcorp/appconnectors/apiv1/appconnectorspb/app_connector_instance_config.pb.go
index bea90b83232..9d8a7c5c4ac 100644
--- a/beyondcorp/appconnectors/apiv1/appconnectorspb/app_connector_instance_config.pb.go
+++ b/beyondcorp/appconnectors/apiv1/appconnectorspb/app_connector_instance_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/beyondcorp/appconnectors/v1/app_connector_instance_config.proto
 
 package appconnectorspb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
 )
 
 const (
@@ -48,7 +48,7 @@ type AppConnectorInstanceConfig struct {
 	// sequenceNumber should be bumped up to reflect the change.
 	SequenceNumber int64 `protobuf:"varint,1,opt,name=sequence_number,json=sequenceNumber,proto3" json:"sequence_number,omitempty"`
 	// The SLM instance agent configuration.
-	InstanceConfig *any1.Any `protobuf:"bytes,2,opt,name=instance_config,json=instanceConfig,proto3" json:"instance_config,omitempty"`
+	InstanceConfig *anypb.Any `protobuf:"bytes,2,opt,name=instance_config,json=instanceConfig,proto3" json:"instance_config,omitempty"`
 	// NotificationConfig defines the notification mechanism that the remote
 	// instance should subscribe to in order to receive notification.
 	NotificationConfig *NotificationConfig `protobuf:"bytes,3,opt,name=notification_config,json=notificationConfig,proto3" json:"notification_config,omitempty"`
@@ -96,7 +96,7 @@ func (x *AppConnectorInstanceConfig) GetSequenceNumber() int64 {
 	return 0
 }
 
-func (x *AppConnectorInstanceConfig) GetInstanceConfig() *any1.Any {
+func (x *AppConnectorInstanceConfig) GetInstanceConfig() *anypb.Any {
 	if x != nil {
 		return x.InstanceConfig
 	}
@@ -392,7 +392,7 @@ var file_google_cloud_beyondcorp_appconnectors_v1_app_connector_instance_config_
 	(*NotificationConfig)(nil),                               // 1: google.cloud.beyondcorp.appconnectors.v1.NotificationConfig
 	(*ImageConfig)(nil),                                      // 2: google.cloud.beyondcorp.appconnectors.v1.ImageConfig
 	(*NotificationConfig_CloudPubSubNotificationConfig)(nil), // 3: google.cloud.beyondcorp.appconnectors.v1.NotificationConfig.CloudPubSubNotificationConfig
-	(*any1.Any)(nil),                                         // 4: google.protobuf.Any
+	(*anypb.Any)(nil),                                        // 4: google.protobuf.Any
 }
 var file_google_cloud_beyondcorp_appconnectors_v1_app_connector_instance_config_proto_depIdxs = []int32{
 	4, // 0: google.cloud.beyondcorp.appconnectors.v1.AppConnectorInstanceConfig.instance_config:type_name -> google.protobuf.Any
diff --git a/beyondcorp/appconnectors/apiv1/appconnectorspb/app_connectors_service.pb.go b/beyondcorp/appconnectors/apiv1/appconnectorspb/app_connectors_service.pb.go
index a27b7cf3305..fa046cfcde6 100644
--- a/beyondcorp/appconnectors/apiv1/appconnectorspb/app_connectors_service.pb.go
+++ b/beyondcorp/appconnectors/apiv1/appconnectorspb/app_connectors_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/beyondcorp/appconnectors/v1/app_connectors_service.proto
 
 package appconnectorspb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -436,7 +436,7 @@ type UpdateAppConnectorRequest struct {
 	// fields from [BeyondCorp.AppConnector]:
 	// * `labels`
 	// * `display_name`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. AppConnector message with updated fields. Only supported fields
 	// specified in update_mask are updated.
 	AppConnector *AppConnector `protobuf:"bytes,2,opt,name=app_connector,json=appConnector,proto3" json:"app_connector,omitempty"`
@@ -491,7 +491,7 @@ func (*UpdateAppConnectorRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_beyondcorp_appconnectors_v1_app_connectors_service_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *UpdateAppConnectorRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAppConnectorRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -704,9 +704,9 @@ type AppConnector struct {
 	// The name is ignored when creating a AppConnector.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. Timestamp when the resource was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp when the resource was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Resource labels to represent user provided metadata.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. An arbitrary user-provided name for the AppConnector. Cannot
@@ -762,14 +762,14 @@ func (x *AppConnector) GetName() string {
 	return ""
 }
 
-func (x *AppConnector) GetCreateTime() *timestamp.Timestamp {
+func (x *AppConnector) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AppConnector) GetUpdateTime() *timestamp.Timestamp {
+func (x *AppConnector) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -825,9 +825,9 @@ type AppConnectorOperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -876,14 +876,14 @@ func (*AppConnectorOperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_beyondcorp_appconnectors_v1_app_connectors_service_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *AppConnectorOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *AppConnectorOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AppConnectorOperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *AppConnectorOperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1417,9 +1417,9 @@ var file_google_cloud_beyondcorp_appconnectors_v1_app_connectors_service_proto_g
 	(*AppConnector_PrincipalInfo)(nil),                // 10: google.cloud.beyondcorp.appconnectors.v1.AppConnector.PrincipalInfo
 	nil,                                               // 11: google.cloud.beyondcorp.appconnectors.v1.AppConnector.LabelsEntry
 	(*AppConnector_PrincipalInfo_ServiceAccount)(nil), // 12: google.cloud.beyondcorp.appconnectors.v1.AppConnector.PrincipalInfo.ServiceAccount
-	(*field_mask.FieldMask)(nil),                      // 13: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                     // 13: google.protobuf.FieldMask
 	(*ResourceInfo)(nil),                              // 14: google.cloud.beyondcorp.appconnectors.v1.ResourceInfo
-	(*timestamp.Timestamp)(nil),                       // 15: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                     // 15: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),                     // 16: google.longrunning.Operation
 }
 var file_google_cloud_beyondcorp_appconnectors_v1_app_connectors_service_proto_depIdxs = []int32{
diff --git a/beyondcorp/appconnectors/apiv1/appconnectorspb/resource_info.pb.go b/beyondcorp/appconnectors/apiv1/appconnectorspb/resource_info.pb.go
index 45ed3dc30be..503725b310f 100644
--- a/beyondcorp/appconnectors/apiv1/appconnectorspb/resource_info.pb.go
+++ b/beyondcorp/appconnectors/apiv1/appconnectorspb/resource_info.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/beyondcorp/appconnectors/v1/resource_info.proto
 
 package appconnectorspb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -120,10 +120,10 @@ type ResourceInfo struct {
 	// each sub level resources.
 	Status HealthStatus `protobuf:"varint,2,opt,name=status,proto3,enum=google.cloud.beyondcorp.appconnectors.v1.HealthStatus" json:"status,omitempty"`
 	// Specific details for the resource. This is for internal use only.
-	Resource *any1.Any `protobuf:"bytes,3,opt,name=resource,proto3" json:"resource,omitempty"`
+	Resource *anypb.Any `protobuf:"bytes,3,opt,name=resource,proto3" json:"resource,omitempty"`
 	// The timestamp to collect the info. It is suggested to be set by
 	// the topmost level resource only.
-	Time *timestamp.Timestamp `protobuf:"bytes,4,opt,name=time,proto3" json:"time,omitempty"`
+	Time *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=time,proto3" json:"time,omitempty"`
 	// List of Info for the sub level resources.
 	Sub []*ResourceInfo `protobuf:"bytes,5,rep,name=sub,proto3" json:"sub,omitempty"`
 }
@@ -174,14 +174,14 @@ func (x *ResourceInfo) GetStatus() HealthStatus {
 	return HealthStatus_HEALTH_STATUS_UNSPECIFIED
 }
 
-func (x *ResourceInfo) GetResource() *any1.Any {
+func (x *ResourceInfo) GetResource() *anypb.Any {
 	if x != nil {
 		return x.Resource
 	}
 	return nil
 }
 
-func (x *ResourceInfo) GetTime() *timestamp.Timestamp {
+func (x *ResourceInfo) GetTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Time
 	}
@@ -271,10 +271,10 @@ func file_google_cloud_beyondcorp_appconnectors_v1_resource_info_proto_rawDescGZ
 var file_google_cloud_beyondcorp_appconnectors_v1_resource_info_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_beyondcorp_appconnectors_v1_resource_info_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_beyondcorp_appconnectors_v1_resource_info_proto_goTypes = []interface{}{
-	(HealthStatus)(0),           // 0: google.cloud.beyondcorp.appconnectors.v1.HealthStatus
-	(*ResourceInfo)(nil),        // 1: google.cloud.beyondcorp.appconnectors.v1.ResourceInfo
-	(*any1.Any)(nil),            // 2: google.protobuf.Any
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(HealthStatus)(0),             // 0: google.cloud.beyondcorp.appconnectors.v1.HealthStatus
+	(*ResourceInfo)(nil),          // 1: google.cloud.beyondcorp.appconnectors.v1.ResourceInfo
+	(*anypb.Any)(nil),             // 2: google.protobuf.Any
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
 }
 var file_google_cloud_beyondcorp_appconnectors_v1_resource_info_proto_depIdxs = []int32{
 	0, // 0: google.cloud.beyondcorp.appconnectors.v1.ResourceInfo.status:type_name -> google.cloud.beyondcorp.appconnectors.v1.HealthStatus
diff --git a/beyondcorp/appconnectors/apiv1/doc.go b/beyondcorp/appconnectors/apiv1/doc.go
index cfefaae2520..4b3248fa488 100644
--- a/beyondcorp/appconnectors/apiv1/doc.go
+++ b/beyondcorp/appconnectors/apiv1/doc.go
@@ -62,7 +62,7 @@
 //
 //	req := &appconnectorspb.ListAppConnectorsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#ListAppConnectorsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#ListAppConnectorsRequest.
 //	}
 //	it := c.ListAppConnectors(ctx, req)
 //	for {
diff --git a/beyondcorp/appgateways/apiv1/app_gateways_client.go b/beyondcorp/appgateways/apiv1/app_gateways_client.go
index d165adeba17..a53b3185f99 100644
--- a/beyondcorp/appgateways/apiv1/app_gateways_client.go
+++ b/beyondcorp/appgateways/apiv1/app_gateways_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	appgatewayspb "cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	appgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/beyondcorp/appgateways/apiv1/app_gateways_client_example_test.go b/beyondcorp/appgateways/apiv1/app_gateways_client_example_test.go
index b2b6018c310..2790bf6fb92 100644
--- a/beyondcorp/appgateways/apiv1/app_gateways_client_example_test.go
+++ b/beyondcorp/appgateways/apiv1/app_gateways_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	appgateways "cloud.google.com/go/beyondcorp/appgateways/apiv1"
+	appgatewayspb "cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb"
 	"google.golang.org/api/iterator"
-	appgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleClient_ListAppGateways() {
 
 	req := &appgatewayspb.ListAppGatewaysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#ListAppGatewaysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#ListAppGatewaysRequest.
 	}
 	it := c.ListAppGateways(ctx, req)
 	for {
@@ -90,7 +90,7 @@ func ExampleClient_GetAppGateway() {
 
 	req := &appgatewayspb.GetAppGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#GetAppGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#GetAppGatewayRequest.
 	}
 	resp, err := c.GetAppGateway(ctx, req)
 	if err != nil {
@@ -115,7 +115,7 @@ func ExampleClient_CreateAppGateway() {
 
 	req := &appgatewayspb.CreateAppGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#CreateAppGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#CreateAppGatewayRequest.
 	}
 	op, err := c.CreateAppGateway(ctx, req)
 	if err != nil {
@@ -145,7 +145,7 @@ func ExampleClient_DeleteAppGateway() {
 
 	req := &appgatewayspb.DeleteAppGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#DeleteAppGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#DeleteAppGatewayRequest.
 	}
 	op, err := c.DeleteAppGateway(ctx, req)
 	if err != nil {
diff --git a/beyondcorp/appgateways/apiv1/appgatewayspb/app_gateways_service.pb.go b/beyondcorp/appgateways/apiv1/appgatewayspb/app_gateways_service.pb.go
index 4a404f03954..15e3c95ab0a 100644
--- a/beyondcorp/appgateways/apiv1/appgatewayspb/app_gateways_service.pb.go
+++ b/beyondcorp/appgateways/apiv1/appgatewayspb/app_gateways_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/beyondcorp/appgateways/v1/app_gateways_service.proto
 
 package appgatewayspb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -617,9 +617,9 @@ type AppGateway struct {
 	// The name is ignored when creating an AppGateway.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. Timestamp when the resource was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp when the resource was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Resource labels to represent user provided metadata.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. An arbitrary user-provided name for the AppGateway. Cannot exceed
@@ -679,14 +679,14 @@ func (x *AppGateway) GetName() string {
 	return ""
 }
 
-func (x *AppGateway) GetCreateTime() *timestamp.Timestamp {
+func (x *AppGateway) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AppGateway) GetUpdateTime() *timestamp.Timestamp {
+func (x *AppGateway) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -756,9 +756,9 @@ type AppGatewayOperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -807,14 +807,14 @@ func (*AppGatewayOperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_beyondcorp_appgateways_v1_app_gateways_service_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *AppGatewayOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *AppGatewayOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AppGatewayOperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *AppGatewayOperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1206,7 +1206,7 @@ var file_google_cloud_beyondcorp_appgateways_v1_app_gateways_service_proto_goTyp
 	(*AppGatewayOperationMetadata)(nil),    // 9: google.cloud.beyondcorp.appgateways.v1.AppGatewayOperationMetadata
 	(*AppGateway_AllocatedConnection)(nil), // 10: google.cloud.beyondcorp.appgateways.v1.AppGateway.AllocatedConnection
 	nil,                                    // 11: google.cloud.beyondcorp.appgateways.v1.AppGateway.LabelsEntry
-	(*timestamp.Timestamp)(nil),            // 12: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 12: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),          // 13: google.longrunning.Operation
 }
 var file_google_cloud_beyondcorp_appgateways_v1_app_gateways_service_proto_depIdxs = []int32{
diff --git a/beyondcorp/appgateways/apiv1/doc.go b/beyondcorp/appgateways/apiv1/doc.go
index 06709f97f5b..debab1fa729 100644
--- a/beyondcorp/appgateways/apiv1/doc.go
+++ b/beyondcorp/appgateways/apiv1/doc.go
@@ -62,7 +62,7 @@
 //
 //	req := &appgatewayspb.ListAppGatewaysRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#ListAppGatewaysRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#ListAppGatewaysRequest.
 //	}
 //	it := c.ListAppGateways(ctx, req)
 //	for {
diff --git a/beyondcorp/clientconnectorservices/apiv1/client_connector_services_client.go b/beyondcorp/clientconnectorservices/apiv1/client_connector_services_client.go
index 3510f0da5d0..d0be941d49e 100644
--- a/beyondcorp/clientconnectorservices/apiv1/client_connector_services_client.go
+++ b/beyondcorp/clientconnectorservices/apiv1/client_connector_services_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	clientconnectorservicespb "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	clientconnectorservicespb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/beyondcorp/clientconnectorservices/apiv1/client_connector_services_client_example_test.go b/beyondcorp/clientconnectorservices/apiv1/client_connector_services_client_example_test.go
index b195227abc4..3bd50d8f0ba 100644
--- a/beyondcorp/clientconnectorservices/apiv1/client_connector_services_client_example_test.go
+++ b/beyondcorp/clientconnectorservices/apiv1/client_connector_services_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clientconnectorservices "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1"
+	clientconnectorservicespb "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb"
 	"google.golang.org/api/iterator"
-	clientconnectorservicespb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleClient_ListClientConnectorServices() {
 
 	req := &clientconnectorservicespb.ListClientConnectorServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#ListClientConnectorServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#ListClientConnectorServicesRequest.
 	}
 	it := c.ListClientConnectorServices(ctx, req)
 	for {
@@ -90,7 +90,7 @@ func ExampleClient_GetClientConnectorService() {
 
 	req := &clientconnectorservicespb.GetClientConnectorServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#GetClientConnectorServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#GetClientConnectorServiceRequest.
 	}
 	resp, err := c.GetClientConnectorService(ctx, req)
 	if err != nil {
@@ -115,7 +115,7 @@ func ExampleClient_CreateClientConnectorService() {
 
 	req := &clientconnectorservicespb.CreateClientConnectorServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#CreateClientConnectorServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#CreateClientConnectorServiceRequest.
 	}
 	op, err := c.CreateClientConnectorService(ctx, req)
 	if err != nil {
@@ -145,7 +145,7 @@ func ExampleClient_UpdateClientConnectorService() {
 
 	req := &clientconnectorservicespb.UpdateClientConnectorServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#UpdateClientConnectorServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#UpdateClientConnectorServiceRequest.
 	}
 	op, err := c.UpdateClientConnectorService(ctx, req)
 	if err != nil {
@@ -175,7 +175,7 @@ func ExampleClient_DeleteClientConnectorService() {
 
 	req := &clientconnectorservicespb.DeleteClientConnectorServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#DeleteClientConnectorServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#DeleteClientConnectorServiceRequest.
 	}
 	op, err := c.DeleteClientConnectorService(ctx, req)
 	if err != nil {
diff --git a/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb/client_connector_services_service.pb.go b/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb/client_connector_services_service.pb.go
index 9a49e102e60..96fbac2064a 100644
--- a/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb/client_connector_services_service.pb.go
+++ b/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb/client_connector_services_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/beyondcorp/clientconnectorservices/v1/client_connector_services_service.proto
 
 package clientconnectorservicespb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -172,9 +172,9 @@ type ClientConnectorService struct {
 	// Required. Name of resource. The name is ignored during creation.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. [Output only] Create time stamp.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. [Output only] Update time stamp.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. User-provided name.
 	// The display name should follow certain format.
 	// * Must be 6 to 30 characters in length.
@@ -228,14 +228,14 @@ func (x *ClientConnectorService) GetName() string {
 	return ""
 }
 
-func (x *ClientConnectorService) GetCreateTime() *timestamp.Timestamp {
+func (x *ClientConnectorService) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ClientConnectorService) GetUpdateTime() *timestamp.Timestamp {
+func (x *ClientConnectorService) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -589,7 +589,7 @@ type UpdateClientConnectorServiceRequest struct {
 	// user does not provide a mask then all fields will be overwritten.
 	//
 	// Mutable fields: display_name.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The resource being updated.
 	ClientConnectorService *ClientConnectorService `protobuf:"bytes,2,opt,name=client_connector_service,json=clientConnectorService,proto3" json:"client_connector_service,omitempty"`
 	// Optional. An optional request ID to identify requests. Specify a unique
@@ -645,7 +645,7 @@ func (*UpdateClientConnectorServiceRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_beyondcorp_clientconnectorservices_v1_client_connector_services_service_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *UpdateClientConnectorServiceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateClientConnectorServiceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -767,9 +767,9 @@ type ClientConnectorServiceOperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -818,14 +818,14 @@ func (*ClientConnectorServiceOperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_beyondcorp_clientconnectorservices_v1_client_connector_services_service_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *ClientConnectorServiceOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *ClientConnectorServiceOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ClientConnectorServiceOperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *ClientConnectorServiceOperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1591,8 +1591,8 @@ var file_google_cloud_beyondcorp_clientconnectorservices_v1_client_connector_ser
 	(*ClientConnectorService_Ingress_Config)(nil),                  // 12: google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorService.Ingress.Config
 	(*ClientConnectorService_Ingress_Config_DestinationRoute)(nil), // 13: google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorService.Ingress.Config.DestinationRoute
 	(*ClientConnectorService_Egress_PeeredVpc)(nil),                // 14: google.cloud.beyondcorp.clientconnectorservices.v1.ClientConnectorService.Egress.PeeredVpc
-	(*timestamp.Timestamp)(nil),                                    // 15: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                                   // 16: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                                  // 15: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                                  // 16: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),                                  // 17: google.longrunning.Operation
 }
 var file_google_cloud_beyondcorp_clientconnectorservices_v1_client_connector_services_service_proto_depIdxs = []int32{
diff --git a/beyondcorp/clientconnectorservices/apiv1/doc.go b/beyondcorp/clientconnectorservices/apiv1/doc.go
index 624a7799fe7..d41bcbe3a3c 100644
--- a/beyondcorp/clientconnectorservices/apiv1/doc.go
+++ b/beyondcorp/clientconnectorservices/apiv1/doc.go
@@ -62,7 +62,7 @@
 //
 //	req := &clientconnectorservicespb.ListClientConnectorServicesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#ListClientConnectorServicesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#ListClientConnectorServicesRequest.
 //	}
 //	it := c.ListClientConnectorServices(ctx, req)
 //	for {
diff --git a/beyondcorp/clientgateways/apiv1/client_gateways_client.go b/beyondcorp/clientgateways/apiv1/client_gateways_client.go
index da46afbf4b9..e162631e1d9 100644
--- a/beyondcorp/clientgateways/apiv1/client_gateways_client.go
+++ b/beyondcorp/clientgateways/apiv1/client_gateways_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	clientgatewayspb "cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	clientgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/beyondcorp/clientgateways/apiv1/client_gateways_client_example_test.go b/beyondcorp/clientgateways/apiv1/client_gateways_client_example_test.go
index 8717c461adb..710fc85cc1e 100644
--- a/beyondcorp/clientgateways/apiv1/client_gateways_client_example_test.go
+++ b/beyondcorp/clientgateways/apiv1/client_gateways_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clientgateways "cloud.google.com/go/beyondcorp/clientgateways/apiv1"
+	clientgatewayspb "cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb"
 	"google.golang.org/api/iterator"
-	clientgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleClient_ListClientGateways() {
 
 	req := &clientgatewayspb.ListClientGatewaysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#ListClientGatewaysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#ListClientGatewaysRequest.
 	}
 	it := c.ListClientGateways(ctx, req)
 	for {
@@ -90,7 +90,7 @@ func ExampleClient_GetClientGateway() {
 
 	req := &clientgatewayspb.GetClientGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#GetClientGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#GetClientGatewayRequest.
 	}
 	resp, err := c.GetClientGateway(ctx, req)
 	if err != nil {
@@ -115,7 +115,7 @@ func ExampleClient_CreateClientGateway() {
 
 	req := &clientgatewayspb.CreateClientGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#CreateClientGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#CreateClientGatewayRequest.
 	}
 	op, err := c.CreateClientGateway(ctx, req)
 	if err != nil {
@@ -145,7 +145,7 @@ func ExampleClient_DeleteClientGateway() {
 
 	req := &clientgatewayspb.DeleteClientGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#DeleteClientGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#DeleteClientGatewayRequest.
 	}
 	op, err := c.DeleteClientGateway(ctx, req)
 	if err != nil {
diff --git a/beyondcorp/clientgateways/apiv1/clientgatewayspb/client_gateways_service.pb.go b/beyondcorp/clientgateways/apiv1/clientgatewayspb/client_gateways_service.pb.go
index e2800100100..d02e5ea7d8f 100644
--- a/beyondcorp/clientgateways/apiv1/clientgatewayspb/client_gateways_service.pb.go
+++ b/beyondcorp/clientgateways/apiv1/clientgatewayspb/client_gateways_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/beyondcorp/clientgateways/v1/client_gateways_service.proto
 
 package clientgatewayspb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -121,9 +121,9 @@ type ClientGateway struct {
 	// Required. name of resource. The name is ignored during creation.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. [Output only] Create time stamp.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. [Output only] Update time stamp.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The operational state of the gateway.
 	State ClientGateway_State `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.beyondcorp.clientgateways.v1.ClientGateway_State" json:"state,omitempty"`
 	// Output only. A unique identifier for the instance generated by the system.
@@ -174,14 +174,14 @@ func (x *ClientGateway) GetName() string {
 	return ""
 }
 
-func (x *ClientGateway) GetCreateTime() *timestamp.Timestamp {
+func (x *ClientGateway) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ClientGateway) GetUpdateTime() *timestamp.Timestamp {
+func (x *ClientGateway) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -599,9 +599,9 @@ type ClientGatewayOperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -650,14 +650,14 @@ func (*ClientGatewayOperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_beyondcorp_clientgateways_v1_client_gateways_service_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *ClientGatewayOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *ClientGatewayOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ClientGatewayOperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *ClientGatewayOperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -958,7 +958,7 @@ var file_google_cloud_beyondcorp_clientgateways_v1_client_gateways_service_proto
 	(*CreateClientGatewayRequest)(nil),     // 5: google.cloud.beyondcorp.clientgateways.v1.CreateClientGatewayRequest
 	(*DeleteClientGatewayRequest)(nil),     // 6: google.cloud.beyondcorp.clientgateways.v1.DeleteClientGatewayRequest
 	(*ClientGatewayOperationMetadata)(nil), // 7: google.cloud.beyondcorp.clientgateways.v1.ClientGatewayOperationMetadata
-	(*timestamp.Timestamp)(nil),            // 8: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 8: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),          // 9: google.longrunning.Operation
 }
 var file_google_cloud_beyondcorp_clientgateways_v1_client_gateways_service_proto_depIdxs = []int32{
diff --git a/beyondcorp/clientgateways/apiv1/doc.go b/beyondcorp/clientgateways/apiv1/doc.go
index 80486192be0..31e37025219 100644
--- a/beyondcorp/clientgateways/apiv1/doc.go
+++ b/beyondcorp/clientgateways/apiv1/doc.go
@@ -62,7 +62,7 @@
 //
 //	req := &clientgatewayspb.ListClientGatewaysRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#ListClientGatewaysRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#ListClientGatewaysRequest.
 //	}
 //	it := c.ListClientGateways(ctx, req)
 //	for {
diff --git a/beyondcorp/go.mod b/beyondcorp/go.mod
index 18144b1d06f..d1f5bb35c1e 100644
--- a/beyondcorp/go.mod
+++ b/beyondcorp/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/beyondcorp
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/beyondcorp/go.sum b/beyondcorp/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/beyondcorp/go.sum
+++ b/beyondcorp/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/billing/apiv1/billingpb/cloud_billing.pb.go b/billing/apiv1/billingpb/cloud_billing.pb.go
index 1f2ded16829..8ecab6f946a 100644
--- a/billing/apiv1/billingpb/cloud_billing.pb.go
+++ b/billing/apiv1/billingpb/cloud_billing.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/billing/v1/cloud_billing.proto
 
 package billingpb
@@ -28,12 +28,12 @@ import (
 
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -466,7 +466,7 @@ type UpdateBillingAccountRequest struct {
 	Account *BillingAccount `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"`
 	// The update mask applied to the resource.
 	// Only "display_name" is currently supported.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateBillingAccountRequest) Reset() {
@@ -515,7 +515,7 @@ func (x *UpdateBillingAccountRequest) GetAccount() *BillingAccount {
 	return nil
 }
 
-func (x *UpdateBillingAccountRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateBillingAccountRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1039,7 +1039,7 @@ var file_google_cloud_billing_v1_cloud_billing_proto_goTypes = []interface{}{
 	(*ListProjectBillingInfoResponse)(nil),  // 8: google.cloud.billing.v1.ListProjectBillingInfoResponse
 	(*GetProjectBillingInfoRequest)(nil),    // 9: google.cloud.billing.v1.GetProjectBillingInfoRequest
 	(*UpdateProjectBillingInfoRequest)(nil), // 10: google.cloud.billing.v1.UpdateProjectBillingInfoRequest
-	(*field_mask.FieldMask)(nil),            // 11: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),           // 11: google.protobuf.FieldMask
 	(*v1.GetIamPolicyRequest)(nil),          // 12: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),          // 13: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),    // 14: google.iam.v1.TestIamPermissionsRequest
diff --git a/billing/apiv1/billingpb/cloud_catalog.pb.go b/billing/apiv1/billingpb/cloud_catalog.pb.go
index 2d31aa7a24d..16fcd97ef35 100644
--- a/billing/apiv1/billingpb/cloud_catalog.pb.go
+++ b/billing/apiv1/billingpb/cloud_catalog.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/billing/v1/cloud_catalog.proto
 
 package billingpb
@@ -26,7 +26,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	money "google.golang.org/genproto/googleapis/type/money"
 	grpc "google.golang.org/grpc"
@@ -34,6 +33,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -426,7 +426,7 @@ type PricingInfo struct {
 	// request. If a time range was not specified in the request this field will
 	// be equivalent to a time within the last 12 hours, indicating the latest
 	// pricing info.
-	EffectiveTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=effective_time,json=effectiveTime,proto3" json:"effective_time,omitempty"`
+	EffectiveTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=effective_time,json=effectiveTime,proto3" json:"effective_time,omitempty"`
 	// An optional human readable summary of the pricing information, has a
 	// maximum length of 256 characters.
 	Summary string `protobuf:"bytes,2,opt,name=summary,proto3" json:"summary,omitempty"`
@@ -475,7 +475,7 @@ func (*PricingInfo) Descriptor() ([]byte, []int) {
 	return file_google_cloud_billing_v1_cloud_catalog_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *PricingInfo) GetEffectiveTime() *timestamp.Timestamp {
+func (x *PricingInfo) GetEffectiveTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EffectiveTime
 	}
@@ -842,14 +842,14 @@ type ListSkusRequest struct {
 	// America/Los_Angeles timezone. Time range as a whole is optional. If not
 	// specified, the latest pricing will be returned (up to 12 hours old at
 	// most).
-	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Optional exclusive end time of the time range for which the pricing
 	// versions will be returned. Timestamps in the future are not allowed.
 	// The time range has to be within a single calendar month in
 	// America/Los_Angeles timezone. Time range as a whole is optional. If not
 	// specified, the latest pricing will be returned (up to 12 hours old at
 	// most).
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The ISO 4217 currency code for the pricing info in the response proto.
 	// Will use the conversion rate as of start_time.
 	// Optional. If not specified USD will be used.
@@ -901,14 +901,14 @@ func (x *ListSkusRequest) GetParent() string {
 	return ""
 }
 
-func (x *ListSkusRequest) GetStartTime() *timestamp.Timestamp {
+func (x *ListSkusRequest) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *ListSkusRequest) GetEndTime() *timestamp.Timestamp {
+func (x *ListSkusRequest) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1306,7 +1306,7 @@ var file_google_cloud_billing_v1_cloud_catalog_proto_goTypes = []interface{}{
 	(*ListSkusRequest)(nil),                  // 10: google.cloud.billing.v1.ListSkusRequest
 	(*ListSkusResponse)(nil),                 // 11: google.cloud.billing.v1.ListSkusResponse
 	(*PricingExpression_TierRate)(nil),       // 12: google.cloud.billing.v1.PricingExpression.TierRate
-	(*timestamp.Timestamp)(nil),              // 13: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),            // 13: google.protobuf.Timestamp
 	(*money.Money)(nil),                      // 14: google.type.Money
 }
 var file_google_cloud_billing_v1_cloud_catalog_proto_depIdxs = []int32{
diff --git a/billing/apiv1/cloud_billing_client.go b/billing/apiv1/cloud_billing_client.go
index 059d0b3aa1d..00302d62ebd 100644
--- a/billing/apiv1/cloud_billing_client.go
+++ b/billing/apiv1/cloud_billing_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/billing/apiv1/cloud_billing_client_example_test.go b/billing/apiv1/cloud_billing_client_example_test.go
index f510f4f0cdf..d7b77994d9b 100644
--- a/billing/apiv1/cloud_billing_client_example_test.go
+++ b/billing/apiv1/cloud_billing_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 	"google.golang.org/api/iterator"
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleCloudBillingClient_GetBillingAccount() {
 
 	req := &billingpb.GetBillingAccountRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#GetBillingAccountRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#GetBillingAccountRequest.
 	}
 	resp, err := c.GetBillingAccount(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleCloudBillingClient_ListBillingAccounts() {
 
 	req := &billingpb.ListBillingAccountsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#ListBillingAccountsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#ListBillingAccountsRequest.
 	}
 	it := c.ListBillingAccounts(ctx, req)
 	for {
@@ -113,7 +113,7 @@ func ExampleCloudBillingClient_UpdateBillingAccount() {
 
 	req := &billingpb.UpdateBillingAccountRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#UpdateBillingAccountRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#UpdateBillingAccountRequest.
 	}
 	resp, err := c.UpdateBillingAccount(ctx, req)
 	if err != nil {
@@ -138,7 +138,7 @@ func ExampleCloudBillingClient_CreateBillingAccount() {
 
 	req := &billingpb.CreateBillingAccountRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#CreateBillingAccountRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#CreateBillingAccountRequest.
 	}
 	resp, err := c.CreateBillingAccount(ctx, req)
 	if err != nil {
@@ -163,7 +163,7 @@ func ExampleCloudBillingClient_ListProjectBillingInfo() {
 
 	req := &billingpb.ListProjectBillingInfoRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#ListProjectBillingInfoRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#ListProjectBillingInfoRequest.
 	}
 	it := c.ListProjectBillingInfo(ctx, req)
 	for {
@@ -194,7 +194,7 @@ func ExampleCloudBillingClient_GetProjectBillingInfo() {
 
 	req := &billingpb.GetProjectBillingInfoRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#GetProjectBillingInfoRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#GetProjectBillingInfoRequest.
 	}
 	resp, err := c.GetProjectBillingInfo(ctx, req)
 	if err != nil {
@@ -219,7 +219,7 @@ func ExampleCloudBillingClient_UpdateProjectBillingInfo() {
 
 	req := &billingpb.UpdateProjectBillingInfoRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#UpdateProjectBillingInfoRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#UpdateProjectBillingInfoRequest.
 	}
 	resp, err := c.UpdateProjectBillingInfo(ctx, req)
 	if err != nil {
diff --git a/billing/apiv1/cloud_catalog_client.go b/billing/apiv1/cloud_catalog_client.go
index 35ac331a40e..b07b1bdef5a 100644
--- a/billing/apiv1/cloud_catalog_client.go
+++ b/billing/apiv1/cloud_catalog_client.go
@@ -22,12 +22,12 @@ import (
 	"math"
 	"net/url"
 
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/billing/apiv1/cloud_catalog_client_example_test.go b/billing/apiv1/cloud_catalog_client_example_test.go
index 73851d0c439..bd13a3bff5b 100644
--- a/billing/apiv1/cloud_catalog_client_example_test.go
+++ b/billing/apiv1/cloud_catalog_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 	"google.golang.org/api/iterator"
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
 )
 
 func ExampleNewCloudCatalogClient() {
@@ -56,7 +56,7 @@ func ExampleCloudCatalogClient_ListServices() {
 
 	req := &billingpb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleCloudCatalogClient_ListSkus() {
 
 	req := &billingpb.ListSkusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#ListSkusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#ListSkusRequest.
 	}
 	it := c.ListSkus(ctx, req)
 	for {
diff --git a/billing/apiv1/doc.go b/billing/apiv1/doc.go
index bfd876ed721..35c000babe2 100644
--- a/billing/apiv1/doc.go
+++ b/billing/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &billingpb.GetBillingAccountRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#GetBillingAccountRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#GetBillingAccountRequest.
 //	}
 //	resp, err := c.GetBillingAccount(ctx, req)
 //	if err != nil {
diff --git a/billing/budgets/apiv1/budget_client.go b/billing/budgets/apiv1/budget_client.go
index a1f09854a66..35f48c5f8df 100644
--- a/billing/budgets/apiv1/budget_client.go
+++ b/billing/budgets/apiv1/budget_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	budgetspb "cloud.google.com/go/billing/budgets/apiv1/budgetspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	budgetspb "google.golang.org/genproto/googleapis/cloud/billing/budgets/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/billing/budgets/apiv1/budget_client_example_test.go b/billing/budgets/apiv1/budget_client_example_test.go
index b556cb6941e..d2c21759be0 100644
--- a/billing/budgets/apiv1/budget_client_example_test.go
+++ b/billing/budgets/apiv1/budget_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	budgets "cloud.google.com/go/billing/budgets/apiv1"
+	budgetspb "cloud.google.com/go/billing/budgets/apiv1/budgetspb"
 	"google.golang.org/api/iterator"
-	budgetspb "google.golang.org/genproto/googleapis/cloud/billing/budgets/v1"
 )
 
 func ExampleNewBudgetClient() {
@@ -56,7 +56,7 @@ func ExampleBudgetClient_CreateBudget() {
 
 	req := &budgetspb.CreateBudgetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#CreateBudgetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#CreateBudgetRequest.
 	}
 	resp, err := c.CreateBudget(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleBudgetClient_UpdateBudget() {
 
 	req := &budgetspb.UpdateBudgetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#UpdateBudgetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#UpdateBudgetRequest.
 	}
 	resp, err := c.UpdateBudget(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleBudgetClient_GetBudget() {
 
 	req := &budgetspb.GetBudgetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#GetBudgetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#GetBudgetRequest.
 	}
 	resp, err := c.GetBudget(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleBudgetClient_ListBudgets() {
 
 	req := &budgetspb.ListBudgetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#ListBudgetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#ListBudgetsRequest.
 	}
 	it := c.ListBudgets(ctx, req)
 	for {
@@ -162,7 +162,7 @@ func ExampleBudgetClient_DeleteBudget() {
 
 	req := &budgetspb.DeleteBudgetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#DeleteBudgetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#DeleteBudgetRequest.
 	}
 	err = c.DeleteBudget(ctx, req)
 	if err != nil {
diff --git a/billing/budgets/apiv1/budgetspb/budget_model.pb.go b/billing/budgets/apiv1/budgetspb/budget_model.pb.go
index 0261b2ebab7..3069f0a03c2 100644
--- a/billing/budgets/apiv1/budgetspb/budget_model.pb.go
+++ b/billing/budgets/apiv1/budgetspb/budget_model.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/billing/budgets/v1/budget_model.proto
 
 package budgetspb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	date "google.golang.org/genproto/googleapis/type/date"
 	money "google.golang.org/genproto/googleapis/type/money"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -692,7 +692,7 @@ type Filter struct {
 	// this set of labeled resources should be included in the budget. Currently,
 	// multiple entries or multiple values per entry are not allowed. If omitted,
 	// the report will include all labeled and unlabeled usage.
-	Labels map[string]*_struct.ListValue `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Labels map[string]*structpb.ListValue `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Multiple options to choose the budget's time period, specifying that only
 	// usage that occurs during this time period should be included in the budget.
 	// If not set, the `usage_period` defaults to CalendarPeriod.MONTH.
@@ -771,7 +771,7 @@ func (x *Filter) GetSubaccounts() []string {
 	return nil
 }
 
-func (x *Filter) GetLabels() map[string]*_struct.ListValue {
+func (x *Filter) GetLabels() map[string]*structpb.ListValue {
 	if x != nil {
 		return x.Labels
 	}
@@ -1081,7 +1081,7 @@ var file_google_cloud_billing_budgets_v1_budget_model_proto_goTypes = []interfac
 	nil,                              // 10: google.cloud.billing.budgets.v1.Filter.LabelsEntry
 	(*money.Money)(nil),              // 11: google.type.Money
 	(*date.Date)(nil),                // 12: google.type.Date
-	(*_struct.ListValue)(nil),        // 13: google.protobuf.ListValue
+	(*structpb.ListValue)(nil),       // 13: google.protobuf.ListValue
 }
 var file_google_cloud_billing_budgets_v1_budget_model_proto_depIdxs = []int32{
 	8,  // 0: google.cloud.billing.budgets.v1.Budget.budget_filter:type_name -> google.cloud.billing.budgets.v1.Filter
diff --git a/billing/budgets/apiv1/budgetspb/budget_service.pb.go b/billing/budgets/apiv1/budgetspb/budget_service.pb.go
index 63cfae1e8e3..c2f930e95ae 100644
--- a/billing/budgets/apiv1/budgetspb/budget_service.pb.go
+++ b/billing/budgets/apiv1/budgetspb/budget_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/billing/budgets/v1/budget_service.proto
 
 package budgetspb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -116,7 +116,7 @@ type UpdateBudgetRequest struct {
 	// updated. See
 	// https://developers.google.com/protocol-buffers/docs/proto3#default for more
 	// details about default values.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateBudgetRequest) Reset() {
@@ -158,7 +158,7 @@ func (x *UpdateBudgetRequest) GetBudget() *Budget {
 	return nil
 }
 
-func (x *UpdateBudgetRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateBudgetRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -556,15 +556,15 @@ func file_google_cloud_billing_budgets_v1_budget_service_proto_rawDescGZIP() []b
 
 var file_google_cloud_billing_budgets_v1_budget_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_google_cloud_billing_budgets_v1_budget_service_proto_goTypes = []interface{}{
-	(*CreateBudgetRequest)(nil),  // 0: google.cloud.billing.budgets.v1.CreateBudgetRequest
-	(*UpdateBudgetRequest)(nil),  // 1: google.cloud.billing.budgets.v1.UpdateBudgetRequest
-	(*GetBudgetRequest)(nil),     // 2: google.cloud.billing.budgets.v1.GetBudgetRequest
-	(*ListBudgetsRequest)(nil),   // 3: google.cloud.billing.budgets.v1.ListBudgetsRequest
-	(*ListBudgetsResponse)(nil),  // 4: google.cloud.billing.budgets.v1.ListBudgetsResponse
-	(*DeleteBudgetRequest)(nil),  // 5: google.cloud.billing.budgets.v1.DeleteBudgetRequest
-	(*Budget)(nil),               // 6: google.cloud.billing.budgets.v1.Budget
-	(*field_mask.FieldMask)(nil), // 7: google.protobuf.FieldMask
-	(*empty.Empty)(nil),          // 8: google.protobuf.Empty
+	(*CreateBudgetRequest)(nil),   // 0: google.cloud.billing.budgets.v1.CreateBudgetRequest
+	(*UpdateBudgetRequest)(nil),   // 1: google.cloud.billing.budgets.v1.UpdateBudgetRequest
+	(*GetBudgetRequest)(nil),      // 2: google.cloud.billing.budgets.v1.GetBudgetRequest
+	(*ListBudgetsRequest)(nil),    // 3: google.cloud.billing.budgets.v1.ListBudgetsRequest
+	(*ListBudgetsResponse)(nil),   // 4: google.cloud.billing.budgets.v1.ListBudgetsResponse
+	(*DeleteBudgetRequest)(nil),   // 5: google.cloud.billing.budgets.v1.DeleteBudgetRequest
+	(*Budget)(nil),                // 6: google.cloud.billing.budgets.v1.Budget
+	(*fieldmaskpb.FieldMask)(nil), // 7: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),         // 8: google.protobuf.Empty
 }
 var file_google_cloud_billing_budgets_v1_budget_service_proto_depIdxs = []int32{
 	6, // 0: google.cloud.billing.budgets.v1.CreateBudgetRequest.budget:type_name -> google.cloud.billing.budgets.v1.Budget
@@ -725,7 +725,7 @@ type BudgetServiceClient interface {
 	// in the Cloud Console.
 	ListBudgets(ctx context.Context, in *ListBudgetsRequest, opts ...grpc.CallOption) (*ListBudgetsResponse, error)
 	// Deletes a budget. Returns successfully if already deleted.
-	DeleteBudget(ctx context.Context, in *DeleteBudgetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteBudget(ctx context.Context, in *DeleteBudgetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type budgetServiceClient struct {
@@ -772,8 +772,8 @@ func (c *budgetServiceClient) ListBudgets(ctx context.Context, in *ListBudgetsRe
 	return out, nil
 }
 
-func (c *budgetServiceClient) DeleteBudget(ctx context.Context, in *DeleteBudgetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *budgetServiceClient) DeleteBudget(ctx context.Context, in *DeleteBudgetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.billing.budgets.v1.BudgetService/DeleteBudget", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -808,7 +808,7 @@ type BudgetServiceServer interface {
 	// in the Cloud Console.
 	ListBudgets(context.Context, *ListBudgetsRequest) (*ListBudgetsResponse, error)
 	// Deletes a budget. Returns successfully if already deleted.
-	DeleteBudget(context.Context, *DeleteBudgetRequest) (*empty.Empty, error)
+	DeleteBudget(context.Context, *DeleteBudgetRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedBudgetServiceServer can be embedded to have forward compatible implementations.
@@ -827,7 +827,7 @@ func (*UnimplementedBudgetServiceServer) GetBudget(context.Context, *GetBudgetRe
 func (*UnimplementedBudgetServiceServer) ListBudgets(context.Context, *ListBudgetsRequest) (*ListBudgetsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListBudgets not implemented")
 }
-func (*UnimplementedBudgetServiceServer) DeleteBudget(context.Context, *DeleteBudgetRequest) (*empty.Empty, error) {
+func (*UnimplementedBudgetServiceServer) DeleteBudget(context.Context, *DeleteBudgetRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteBudget not implemented")
 }
 
diff --git a/billing/budgets/apiv1/doc.go b/billing/budgets/apiv1/doc.go
index fcbeab8eb6f..df95d5a7182 100644
--- a/billing/budgets/apiv1/doc.go
+++ b/billing/budgets/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &budgetspb.CreateBudgetRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#CreateBudgetRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#CreateBudgetRequest.
 //	}
 //	resp, err := c.CreateBudget(ctx, req)
 //	if err != nil {
diff --git a/billing/go.mod b/billing/go.mod
index 0cbd7fffc37..a1e8a2d1645 100644
--- a/billing/go.mod
+++ b/billing/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/billing/go.sum b/billing/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/billing/go.sum
+++ b/billing/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/binaryauthorization/apiv1/binaryauthorizationpb/resources.pb.go b/binaryauthorization/apiv1/binaryauthorizationpb/resources.pb.go
index fe8307d7ed4..526a39e331b 100644
--- a/binaryauthorization/apiv1/binaryauthorizationpb/resources.pb.go
+++ b/binaryauthorization/apiv1/binaryauthorizationpb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/binaryauthorization/v1/resources.proto
 
 package binaryauthorizationpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -352,7 +352,7 @@ type Policy struct {
 	// kubernetes-service-account, or per-istio-service-identity admission rule.
 	DefaultAdmissionRule *AdmissionRule `protobuf:"bytes,4,opt,name=default_admission_rule,json=defaultAdmissionRule,proto3" json:"default_admission_rule,omitempty"`
 	// Output only. Time when the policy was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Policy) Reset() {
@@ -450,7 +450,7 @@ func (x *Policy) GetDefaultAdmissionRule() *AdmissionRule {
 	return nil
 }
 
-func (x *Policy) GetUpdateTime() *timestamp.Timestamp {
+func (x *Policy) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -609,7 +609,7 @@ type Attestor struct {
 	//	*Attestor_UserOwnedGrafeasNote
 	AttestorType isAttestor_AttestorType `protobuf_oneof:"attestor_type"`
 	// Output only. Time when the attestor was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Attestor) Reset() {
@@ -672,7 +672,7 @@ func (x *Attestor) GetUserOwnedGrafeasNote() *UserOwnedGrafeasNote {
 	return nil
 }
 
-func (x *Attestor) GetUpdateTime() *timestamp.Timestamp {
+func (x *Attestor) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1283,7 +1283,7 @@ var file_google_cloud_binaryauthorization_v1_resources_proto_goTypes = []interfa
 	nil,                                    // 12: google.cloud.binaryauthorization.v1.Policy.KubernetesNamespaceAdmissionRulesEntry
 	nil,                                    // 13: google.cloud.binaryauthorization.v1.Policy.KubernetesServiceAccountAdmissionRulesEntry
 	nil,                                    // 14: google.cloud.binaryauthorization.v1.Policy.IstioServiceIdentityAdmissionRulesEntry
-	(*timestamp.Timestamp)(nil),            // 15: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 15: google.protobuf.Timestamp
 }
 var file_google_cloud_binaryauthorization_v1_resources_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.binaryauthorization.v1.Policy.global_policy_evaluation_mode:type_name -> google.cloud.binaryauthorization.v1.Policy.GlobalPolicyEvaluationMode
diff --git a/binaryauthorization/apiv1/binaryauthorizationpb/service.pb.go b/binaryauthorization/apiv1/binaryauthorizationpb/service.pb.go
index fc276864e72..030c676a008 100644
--- a/binaryauthorization/apiv1/binaryauthorizationpb/service.pb.go
+++ b/binaryauthorization/apiv1/binaryauthorizationpb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/binaryauthorization/v1/service.proto
 
 package binaryauthorizationpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	v1 "google.golang.org/genproto/googleapis/grafeas/v1"
 	grpc "google.golang.org/grpc"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -1042,7 +1042,7 @@ var file_google_cloud_binaryauthorization_v1_service_proto_goTypes = []interface
 	(*Policy)(nil),                                    // 12: google.cloud.binaryauthorization.v1.Policy
 	(*Attestor)(nil),                                  // 13: google.cloud.binaryauthorization.v1.Attestor
 	(*v1.AttestationOccurrence)(nil),                  // 14: grafeas.v1.AttestationOccurrence
-	(*empty.Empty)(nil),                               // 15: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                             // 15: google.protobuf.Empty
 }
 var file_google_cloud_binaryauthorization_v1_service_proto_depIdxs = []int32{
 	12, // 0: google.cloud.binaryauthorization.v1.UpdatePolicyRequest.policy:type_name -> google.cloud.binaryauthorization.v1.Policy
@@ -1279,7 +1279,7 @@ type BinauthzManagementServiceV1Client interface {
 	ListAttestors(ctx context.Context, in *ListAttestorsRequest, opts ...grpc.CallOption) (*ListAttestorsResponse, error)
 	// Deletes an [attestor][google.cloud.binaryauthorization.v1.Attestor]. Returns NOT_FOUND if the
 	// [attestor][google.cloud.binaryauthorization.v1.Attestor] does not exist.
-	DeleteAttestor(ctx context.Context, in *DeleteAttestorRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAttestor(ctx context.Context, in *DeleteAttestorRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type binauthzManagementServiceV1Client struct {
@@ -1344,8 +1344,8 @@ func (c *binauthzManagementServiceV1Client) ListAttestors(ctx context.Context, i
 	return out, nil
 }
 
-func (c *binauthzManagementServiceV1Client) DeleteAttestor(ctx context.Context, in *DeleteAttestorRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *binauthzManagementServiceV1Client) DeleteAttestor(ctx context.Context, in *DeleteAttestorRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.binaryauthorization.v1.BinauthzManagementServiceV1/DeleteAttestor", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1385,7 +1385,7 @@ type BinauthzManagementServiceV1Server interface {
 	ListAttestors(context.Context, *ListAttestorsRequest) (*ListAttestorsResponse, error)
 	// Deletes an [attestor][google.cloud.binaryauthorization.v1.Attestor]. Returns NOT_FOUND if the
 	// [attestor][google.cloud.binaryauthorization.v1.Attestor] does not exist.
-	DeleteAttestor(context.Context, *DeleteAttestorRequest) (*empty.Empty, error)
+	DeleteAttestor(context.Context, *DeleteAttestorRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedBinauthzManagementServiceV1Server can be embedded to have forward compatible implementations.
@@ -1410,7 +1410,7 @@ func (*UnimplementedBinauthzManagementServiceV1Server) UpdateAttestor(context.Co
 func (*UnimplementedBinauthzManagementServiceV1Server) ListAttestors(context.Context, *ListAttestorsRequest) (*ListAttestorsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListAttestors not implemented")
 }
-func (*UnimplementedBinauthzManagementServiceV1Server) DeleteAttestor(context.Context, *DeleteAttestorRequest) (*empty.Empty, error) {
+func (*UnimplementedBinauthzManagementServiceV1Server) DeleteAttestor(context.Context, *DeleteAttestorRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAttestor not implemented")
 }
 
diff --git a/binaryauthorization/apiv1/binauthz_management_client.go b/binaryauthorization/apiv1/binauthz_management_client.go
index 0dfb3374577..f795ca25cd5 100644
--- a/binaryauthorization/apiv1/binauthz_management_client.go
+++ b/binaryauthorization/apiv1/binauthz_management_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/binaryauthorization/apiv1/binauthz_management_client_example_test.go b/binaryauthorization/apiv1/binauthz_management_client_example_test.go
index c53ffd1ea38..08cbd196cb5 100644
--- a/binaryauthorization/apiv1/binauthz_management_client_example_test.go
+++ b/binaryauthorization/apiv1/binauthz_management_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 	"google.golang.org/api/iterator"
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
 )
 
 func ExampleNewBinauthzManagementClient() {
@@ -56,7 +56,7 @@ func ExampleBinauthzManagementClient_GetPolicy() {
 
 	req := &binaryauthorizationpb.GetPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#GetPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#GetPolicyRequest.
 	}
 	resp, err := c.GetPolicy(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleBinauthzManagementClient_UpdatePolicy() {
 
 	req := &binaryauthorizationpb.UpdatePolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#UpdatePolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#UpdatePolicyRequest.
 	}
 	resp, err := c.UpdatePolicy(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleBinauthzManagementClient_CreateAttestor() {
 
 	req := &binaryauthorizationpb.CreateAttestorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#CreateAttestorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#CreateAttestorRequest.
 	}
 	resp, err := c.CreateAttestor(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleBinauthzManagementClient_GetAttestor() {
 
 	req := &binaryauthorizationpb.GetAttestorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#GetAttestorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#GetAttestorRequest.
 	}
 	resp, err := c.GetAttestor(ctx, req)
 	if err != nil {
@@ -156,7 +156,7 @@ func ExampleBinauthzManagementClient_UpdateAttestor() {
 
 	req := &binaryauthorizationpb.UpdateAttestorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#UpdateAttestorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#UpdateAttestorRequest.
 	}
 	resp, err := c.UpdateAttestor(ctx, req)
 	if err != nil {
@@ -181,7 +181,7 @@ func ExampleBinauthzManagementClient_ListAttestors() {
 
 	req := &binaryauthorizationpb.ListAttestorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#ListAttestorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#ListAttestorsRequest.
 	}
 	it := c.ListAttestors(ctx, req)
 	for {
@@ -212,7 +212,7 @@ func ExampleBinauthzManagementClient_DeleteAttestor() {
 
 	req := &binaryauthorizationpb.DeleteAttestorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#DeleteAttestorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#DeleteAttestorRequest.
 	}
 	err = c.DeleteAttestor(ctx, req)
 	if err != nil {
diff --git a/binaryauthorization/apiv1/doc.go b/binaryauthorization/apiv1/doc.go
index 4a2f3b41607..8a796a01196 100644
--- a/binaryauthorization/apiv1/doc.go
+++ b/binaryauthorization/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &binaryauthorizationpb.GetPolicyRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#GetPolicyRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#GetPolicyRequest.
 //	}
 //	resp, err := c.GetPolicy(ctx, req)
 //	if err != nil {
diff --git a/binaryauthorization/apiv1/system_policy_client.go b/binaryauthorization/apiv1/system_policy_client.go
index 767d2bce76b..391d886eba4 100644
--- a/binaryauthorization/apiv1/system_policy_client.go
+++ b/binaryauthorization/apiv1/system_policy_client.go
@@ -22,11 +22,11 @@ import (
 	"math"
 	"net/url"
 
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/binaryauthorization/apiv1/system_policy_client_example_test.go b/binaryauthorization/apiv1/system_policy_client_example_test.go
index c3dbd442172..a10ec588c10 100644
--- a/binaryauthorization/apiv1/system_policy_client_example_test.go
+++ b/binaryauthorization/apiv1/system_policy_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func ExampleNewSystemPolicyClient() {
@@ -55,7 +55,7 @@ func ExampleSystemPolicyClient_GetSystemPolicy() {
 
 	req := &binaryauthorizationpb.GetSystemPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#GetSystemPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#GetSystemPolicyRequest.
 	}
 	resp, err := c.GetSystemPolicy(ctx, req)
 	if err != nil {
diff --git a/binaryauthorization/apiv1/validation_helper_client.go b/binaryauthorization/apiv1/validation_helper_client.go
index d170093df39..3bd7f383834 100644
--- a/binaryauthorization/apiv1/validation_helper_client.go
+++ b/binaryauthorization/apiv1/validation_helper_client.go
@@ -22,11 +22,11 @@ import (
 	"math"
 	"net/url"
 
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/binaryauthorization/apiv1/validation_helper_client_example_test.go b/binaryauthorization/apiv1/validation_helper_client_example_test.go
index ec7b5143c6f..86c33aaecb5 100644
--- a/binaryauthorization/apiv1/validation_helper_client_example_test.go
+++ b/binaryauthorization/apiv1/validation_helper_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func ExampleNewValidationHelperClient() {
@@ -55,7 +55,7 @@ func ExampleValidationHelperClient_ValidateAttestationOccurrence() {
 
 	req := &binaryauthorizationpb.ValidateAttestationOccurrenceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#ValidateAttestationOccurrenceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#ValidateAttestationOccurrenceRequest.
 	}
 	resp, err := c.ValidateAttestationOccurrence(ctx, req)
 	if err != nil {
diff --git a/binaryauthorization/go.mod b/binaryauthorization/go.mod
index e9128d5a072..e5311b0692a 100644
--- a/binaryauthorization/go.mod
+++ b/binaryauthorization/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/binaryauthorization/go.sum b/binaryauthorization/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/binaryauthorization/go.sum
+++ b/binaryauthorization/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/certificatemanager/aliasshim/aliasshim.go b/certificatemanager/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/certificatemanager/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/certificatemanager/apiv1/certificate_manager_client.go b/certificatemanager/apiv1/certificate_manager_client.go
index 0460ea74708..3cd2edf77c2 100644
--- a/certificatemanager/apiv1/certificate_manager_client.go
+++ b/certificatemanager/apiv1/certificate_manager_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/certificatemanager/apiv1/certificate_manager_client_example_test.go b/certificatemanager/apiv1/certificate_manager_client_example_test.go
index 8e37af9c301..94972dc72d0 100644
--- a/certificatemanager/apiv1/certificate_manager_client_example_test.go
+++ b/certificatemanager/apiv1/certificate_manager_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 	"google.golang.org/api/iterator"
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleClient_ListCertificates() {
 
 	req := &certificatemanagerpb.ListCertificatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificatesRequest.
 	}
 	it := c.ListCertificates(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleClient_GetCertificate() {
 
 	req := &certificatemanagerpb.GetCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetCertificateRequest.
 	}
 	resp, err := c.GetCertificate(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleClient_CreateCertificate() {
 
 	req := &certificatemanagerpb.CreateCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateCertificateRequest.
 	}
 	op, err := c.CreateCertificate(ctx, req)
 	if err != nil {
@@ -144,7 +144,7 @@ func ExampleClient_UpdateCertificate() {
 
 	req := &certificatemanagerpb.UpdateCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#UpdateCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#UpdateCertificateRequest.
 	}
 	op, err := c.UpdateCertificate(ctx, req)
 	if err != nil {
@@ -174,7 +174,7 @@ func ExampleClient_DeleteCertificate() {
 
 	req := &certificatemanagerpb.DeleteCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteCertificateRequest.
 	}
 	op, err := c.DeleteCertificate(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleClient_ListCertificateMaps() {
 
 	req := &certificatemanagerpb.ListCertificateMapsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificateMapsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificateMapsRequest.
 	}
 	it := c.ListCertificateMaps(ctx, req)
 	for {
@@ -233,7 +233,7 @@ func ExampleClient_GetCertificateMap() {
 
 	req := &certificatemanagerpb.GetCertificateMapRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetCertificateMapRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetCertificateMapRequest.
 	}
 	resp, err := c.GetCertificateMap(ctx, req)
 	if err != nil {
@@ -258,7 +258,7 @@ func ExampleClient_CreateCertificateMap() {
 
 	req := &certificatemanagerpb.CreateCertificateMapRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateCertificateMapRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateCertificateMapRequest.
 	}
 	op, err := c.CreateCertificateMap(ctx, req)
 	if err != nil {
@@ -288,7 +288,7 @@ func ExampleClient_UpdateCertificateMap() {
 
 	req := &certificatemanagerpb.UpdateCertificateMapRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#UpdateCertificateMapRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#UpdateCertificateMapRequest.
 	}
 	op, err := c.UpdateCertificateMap(ctx, req)
 	if err != nil {
@@ -318,7 +318,7 @@ func ExampleClient_DeleteCertificateMap() {
 
 	req := &certificatemanagerpb.DeleteCertificateMapRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteCertificateMapRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteCertificateMapRequest.
 	}
 	op, err := c.DeleteCertificateMap(ctx, req)
 	if err != nil {
@@ -346,7 +346,7 @@ func ExampleClient_ListCertificateMapEntries() {
 
 	req := &certificatemanagerpb.ListCertificateMapEntriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificateMapEntriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificateMapEntriesRequest.
 	}
 	it := c.ListCertificateMapEntries(ctx, req)
 	for {
@@ -377,7 +377,7 @@ func ExampleClient_GetCertificateMapEntry() {
 
 	req := &certificatemanagerpb.GetCertificateMapEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetCertificateMapEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetCertificateMapEntryRequest.
 	}
 	resp, err := c.GetCertificateMapEntry(ctx, req)
 	if err != nil {
@@ -402,7 +402,7 @@ func ExampleClient_CreateCertificateMapEntry() {
 
 	req := &certificatemanagerpb.CreateCertificateMapEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateCertificateMapEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateCertificateMapEntryRequest.
 	}
 	op, err := c.CreateCertificateMapEntry(ctx, req)
 	if err != nil {
@@ -432,7 +432,7 @@ func ExampleClient_UpdateCertificateMapEntry() {
 
 	req := &certificatemanagerpb.UpdateCertificateMapEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#UpdateCertificateMapEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#UpdateCertificateMapEntryRequest.
 	}
 	op, err := c.UpdateCertificateMapEntry(ctx, req)
 	if err != nil {
@@ -462,7 +462,7 @@ func ExampleClient_DeleteCertificateMapEntry() {
 
 	req := &certificatemanagerpb.DeleteCertificateMapEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteCertificateMapEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteCertificateMapEntryRequest.
 	}
 	op, err := c.DeleteCertificateMapEntry(ctx, req)
 	if err != nil {
@@ -490,7 +490,7 @@ func ExampleClient_ListDnsAuthorizations() {
 
 	req := &certificatemanagerpb.ListDnsAuthorizationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListDnsAuthorizationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListDnsAuthorizationsRequest.
 	}
 	it := c.ListDnsAuthorizations(ctx, req)
 	for {
@@ -521,7 +521,7 @@ func ExampleClient_GetDnsAuthorization() {
 
 	req := &certificatemanagerpb.GetDnsAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetDnsAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetDnsAuthorizationRequest.
 	}
 	resp, err := c.GetDnsAuthorization(ctx, req)
 	if err != nil {
@@ -546,7 +546,7 @@ func ExampleClient_CreateDnsAuthorization() {
 
 	req := &certificatemanagerpb.CreateDnsAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateDnsAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateDnsAuthorizationRequest.
 	}
 	op, err := c.CreateDnsAuthorization(ctx, req)
 	if err != nil {
@@ -576,7 +576,7 @@ func ExampleClient_UpdateDnsAuthorization() {
 
 	req := &certificatemanagerpb.UpdateDnsAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#UpdateDnsAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#UpdateDnsAuthorizationRequest.
 	}
 	op, err := c.UpdateDnsAuthorization(ctx, req)
 	if err != nil {
@@ -606,7 +606,7 @@ func ExampleClient_DeleteDnsAuthorization() {
 
 	req := &certificatemanagerpb.DeleteDnsAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteDnsAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteDnsAuthorizationRequest.
 	}
 	op, err := c.DeleteDnsAuthorization(ctx, req)
 	if err != nil {
@@ -634,7 +634,7 @@ func ExampleClient_ListCertificateIssuanceConfigs() {
 
 	req := &certificatemanagerpb.ListCertificateIssuanceConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificateIssuanceConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificateIssuanceConfigsRequest.
 	}
 	it := c.ListCertificateIssuanceConfigs(ctx, req)
 	for {
@@ -665,7 +665,7 @@ func ExampleClient_GetCertificateIssuanceConfig() {
 
 	req := &certificatemanagerpb.GetCertificateIssuanceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetCertificateIssuanceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetCertificateIssuanceConfigRequest.
 	}
 	resp, err := c.GetCertificateIssuanceConfig(ctx, req)
 	if err != nil {
@@ -690,7 +690,7 @@ func ExampleClient_CreateCertificateIssuanceConfig() {
 
 	req := &certificatemanagerpb.CreateCertificateIssuanceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateCertificateIssuanceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateCertificateIssuanceConfigRequest.
 	}
 	op, err := c.CreateCertificateIssuanceConfig(ctx, req)
 	if err != nil {
@@ -720,7 +720,7 @@ func ExampleClient_DeleteCertificateIssuanceConfig() {
 
 	req := &certificatemanagerpb.DeleteCertificateIssuanceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteCertificateIssuanceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteCertificateIssuanceConfigRequest.
 	}
 	op, err := c.DeleteCertificateIssuanceConfig(ctx, req)
 	if err != nil {
diff --git a/certificatemanager/apiv1/certificatemanagerpb/certificate_issuance_config.pb.go b/certificatemanager/apiv1/certificatemanagerpb/certificate_issuance_config.pb.go
index 07aef6364c5..64e8be56a0d 100644
--- a/certificatemanager/apiv1/certificatemanagerpb/certificate_issuance_config.pb.go
+++ b/certificatemanager/apiv1/certificatemanagerpb/certificate_issuance_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/certificatemanager/v1/certificate_issuance_config.proto
 
 package certificatemanagerpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -430,9 +430,9 @@ type CertificateIssuanceConfig struct {
 	// `projects/*/locations/*/certificateIssuanceConfigs/*`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation timestamp of a CertificateIssuanceConfig.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update timestamp of a CertificateIssuanceConfig.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Set of labels associated with a CertificateIssuanceConfig.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// One or more paragraphs of text description of a CertificateIssuanceConfig.
@@ -441,7 +441,7 @@ type CertificateIssuanceConfig struct {
 	// address, type, authentication to CA service, etc.
 	CertificateAuthorityConfig *CertificateIssuanceConfig_CertificateAuthorityConfig `protobuf:"bytes,6,opt,name=certificate_authority_config,json=certificateAuthorityConfig,proto3" json:"certificate_authority_config,omitempty"`
 	// Required. Workload certificate lifetime requested.
-	Lifetime *duration.Duration `protobuf:"bytes,7,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
+	Lifetime *durationpb.Duration `protobuf:"bytes,7,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
 	// Required. Specifies the percentage of elapsed time of the certificate
 	// lifetime to wait before renewing the certificate. Must be a number between
 	// 1-99, inclusive.
@@ -489,14 +489,14 @@ func (x *CertificateIssuanceConfig) GetName() string {
 	return ""
 }
 
-func (x *CertificateIssuanceConfig) GetCreateTime() *timestamp.Timestamp {
+func (x *CertificateIssuanceConfig) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CertificateIssuanceConfig) GetUpdateTime() *timestamp.Timestamp {
+func (x *CertificateIssuanceConfig) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -524,7 +524,7 @@ func (x *CertificateIssuanceConfig) GetCertificateAuthorityConfig() *Certificate
 	return nil
 }
 
-func (x *CertificateIssuanceConfig) GetLifetime() *duration.Duration {
+func (x *CertificateIssuanceConfig) GetLifetime() *durationpb.Duration {
 	if x != nil {
 		return x.Lifetime
 	}
@@ -888,8 +888,8 @@ var file_google_cloud_certificatemanager_v1_certificate_issuance_config_proto_go
 	(*CertificateIssuanceConfig_CertificateAuthorityConfig)(nil), // 7: google.cloud.certificatemanager.v1.CertificateIssuanceConfig.CertificateAuthorityConfig
 	nil, // 8: google.cloud.certificatemanager.v1.CertificateIssuanceConfig.LabelsEntry
 	(*CertificateIssuanceConfig_CertificateAuthorityConfig_CertificateAuthorityServiceConfig)(nil), // 9: google.cloud.certificatemanager.v1.CertificateIssuanceConfig.CertificateAuthorityConfig.CertificateAuthorityServiceConfig
-	(*timestamp.Timestamp)(nil), // 10: google.protobuf.Timestamp
-	(*duration.Duration)(nil),   // 11: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),   // 11: google.protobuf.Duration
 }
 var file_google_cloud_certificatemanager_v1_certificate_issuance_config_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.certificatemanager.v1.ListCertificateIssuanceConfigsResponse.certificate_issuance_configs:type_name -> google.cloud.certificatemanager.v1.CertificateIssuanceConfig
diff --git a/certificatemanager/apiv1/certificatemanagerpb/certificate_manager.pb.go b/certificatemanager/apiv1/certificatemanagerpb/certificate_manager.pb.go
index 7c68707304b..643ff7000aa 100644
--- a/certificatemanager/apiv1/certificatemanagerpb/certificate_manager.pb.go
+++ b/certificatemanager/apiv1/certificatemanagerpb/certificate_manager.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/certificatemanager/v1/certificate_manager.proto
 
 package certificatemanagerpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -718,7 +718,7 @@ type UpdateCertificateRequest struct {
 	// Required. The update mask applies to the resource. For the `FieldMask`
 	// definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCertificateRequest) Reset() {
@@ -760,7 +760,7 @@ func (x *UpdateCertificateRequest) GetCertificate() *Certificate {
 	return nil
 }
 
-func (x *UpdateCertificateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCertificateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1105,7 +1105,7 @@ type UpdateCertificateMapRequest struct {
 	// Required. The update mask applies to the resource. For the `FieldMask`
 	// definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCertificateMapRequest) Reset() {
@@ -1147,7 +1147,7 @@ func (x *UpdateCertificateMapRequest) GetCertificateMap() *CertificateMap {
 	return nil
 }
 
-func (x *UpdateCertificateMapRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCertificateMapRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1497,7 +1497,7 @@ type UpdateCertificateMapEntryRequest struct {
 	// Required. The update mask applies to the resource. For the `FieldMask`
 	// definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCertificateMapEntryRequest) Reset() {
@@ -1539,7 +1539,7 @@ func (x *UpdateCertificateMapEntryRequest) GetCertificateMapEntry() *Certificate
 	return nil
 }
 
-func (x *UpdateCertificateMapEntryRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCertificateMapEntryRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1884,7 +1884,7 @@ type UpdateDnsAuthorizationRequest struct {
 	// Required. The update mask applies to the resource. For the `FieldMask`
 	// definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateDnsAuthorizationRequest) Reset() {
@@ -1926,7 +1926,7 @@ func (x *UpdateDnsAuthorizationRequest) GetDnsAuthorization() *DnsAuthorization
 	return nil
 }
 
-func (x *UpdateDnsAuthorizationRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDnsAuthorizationRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1990,9 +1990,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Name of the verb executed by the operation.
@@ -2041,14 +2041,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_certificatemanager_v1_certificate_manager_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2102,9 +2102,9 @@ type Certificate struct {
 	// One or more paragraphs of text description of a certificate.
 	Description string `protobuf:"bytes,8,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The creation timestamp of a Certificate.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update timestamp of a Certificate.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Set of labels associated with a Certificate.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Types that are assignable to Type:
@@ -2120,7 +2120,7 @@ type Certificate struct {
 	// Output only. The PEM-encoded certificate chain.
 	PemCertificate string `protobuf:"bytes,9,opt,name=pem_certificate,json=pemCertificate,proto3" json:"pem_certificate,omitempty"`
 	// Output only. The expiry timestamp of a Certificate.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// Immutable. The scope of the certificate.
 	Scope Certificate_Scope `protobuf:"varint,12,opt,name=scope,proto3,enum=google.cloud.certificatemanager.v1.Certificate_Scope" json:"scope,omitempty"`
 }
@@ -2171,14 +2171,14 @@ func (x *Certificate) GetDescription() string {
 	return ""
 }
 
-func (x *Certificate) GetCreateTime() *timestamp.Timestamp {
+func (x *Certificate) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Certificate) GetUpdateTime() *timestamp.Timestamp {
+func (x *Certificate) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2227,7 +2227,7 @@ func (x *Certificate) GetPemCertificate() string {
 	return ""
 }
 
-func (x *Certificate) GetExpireTime() *timestamp.Timestamp {
+func (x *Certificate) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -2272,9 +2272,9 @@ type CertificateMap struct {
 	// One or more paragraphs of text description of a certificate map.
 	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The creation timestamp of a Certificate Map.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update timestamp of a Certificate Map.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Set of labels associated with a Certificate Map.
 	Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. A list of GCLB targets which use this Certificate Map.
@@ -2329,14 +2329,14 @@ func (x *CertificateMap) GetDescription() string {
 	return ""
 }
 
-func (x *CertificateMap) GetCreateTime() *timestamp.Timestamp {
+func (x *CertificateMap) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CertificateMap) GetUpdateTime() *timestamp.Timestamp {
+func (x *CertificateMap) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2370,9 +2370,9 @@ type CertificateMapEntry struct {
 	// One or more paragraphs of text description of a certificate map entry.
 	Description string `protobuf:"bytes,9,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The creation timestamp of a Certificate Map Entry.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update timestamp of a Certificate Map Entry.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Set of labels associated with a Certificate Map Entry.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Types that are assignable to Match:
@@ -2434,14 +2434,14 @@ func (x *CertificateMapEntry) GetDescription() string {
 	return ""
 }
 
-func (x *CertificateMapEntry) GetCreateTime() *timestamp.Timestamp {
+func (x *CertificateMapEntry) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CertificateMapEntry) GetUpdateTime() *timestamp.Timestamp {
+func (x *CertificateMapEntry) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2522,9 +2522,9 @@ type DnsAuthorization struct {
 	// `projects/*/locations/*/dnsAuthorizations/*`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation timestamp of a DnsAuthorization.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update timestamp of a DnsAuthorization.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Set of labels associated with a DnsAuthorization.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// One or more paragraphs of text description of a DnsAuthorization.
@@ -2578,14 +2578,14 @@ func (x *DnsAuthorization) GetName() string {
 	return ""
 }
 
-func (x *DnsAuthorization) GetCreateTime() *timestamp.Timestamp {
+func (x *DnsAuthorization) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *DnsAuthorization) GetUpdateTime() *timestamp.Timestamp {
+func (x *DnsAuthorization) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -4281,9 +4281,9 @@ var file_google_cloud_certificatemanager_v1_certificate_manager_proto_goTypes =
 	(*CertificateMap_GclbTarget_IpConfig)(nil),                                 // 43: google.cloud.certificatemanager.v1.CertificateMap.GclbTarget.IpConfig
 	nil, // 44: google.cloud.certificatemanager.v1.CertificateMapEntry.LabelsEntry
 	(*DnsAuthorization_DnsResourceRecord)(nil), // 45: google.cloud.certificatemanager.v1.DnsAuthorization.DnsResourceRecord
-	nil,                          // 46: google.cloud.certificatemanager.v1.DnsAuthorization.LabelsEntry
-	(*field_mask.FieldMask)(nil), // 47: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),  // 48: google.protobuf.Timestamp
+	nil,                           // 46: google.cloud.certificatemanager.v1.DnsAuthorization.LabelsEntry
+	(*fieldmaskpb.FieldMask)(nil), // 47: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil), // 48: google.protobuf.Timestamp
 	(*ListCertificateIssuanceConfigsRequest)(nil),  // 49: google.cloud.certificatemanager.v1.ListCertificateIssuanceConfigsRequest
 	(*GetCertificateIssuanceConfigRequest)(nil),    // 50: google.cloud.certificatemanager.v1.GetCertificateIssuanceConfigRequest
 	(*CreateCertificateIssuanceConfigRequest)(nil), // 51: google.cloud.certificatemanager.v1.CreateCertificateIssuanceConfigRequest
diff --git a/certificatemanager/apiv1/doc.go b/certificatemanager/apiv1/doc.go
index 2e765886ada..d3503f71afd 100644
--- a/certificatemanager/apiv1/doc.go
+++ b/certificatemanager/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &certificatemanagerpb.ListCertificatesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificatesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificatesRequest.
 //	}
 //	it := c.ListCertificates(ctx, req)
 //	for {
diff --git a/certificatemanager/go.mod b/certificatemanager/go.mod
index f91d78c34cc..507094eb72c 100644
--- a/certificatemanager/go.mod
+++ b/certificatemanager/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/certificatemanager
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/certificatemanager/go.sum b/certificatemanager/go.sum
index 5ae74cfc056..197b62f3d3c 100644
--- a/certificatemanager/go.sum
+++ b/certificatemanager/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b h1:IOQ/4u8ZSLV+xns0LQxzdAcdOJTDMWB+0shVM8KWXBE=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/channel/aliasshim/aliasshim.go b/channel/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/channel/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/channel/apiv1/channelpb/channel_partner_links.pb.go b/channel/apiv1/channelpb/channel_partner_links.pb.go
index 24ae0f10931..e5c1933977d 100644
--- a/channel/apiv1/channelpb/channel_partner_links.pb.go
+++ b/channel/apiv1/channelpb/channel_partner_links.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/channel_partner_links.proto
 
 package channelpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -171,9 +171,9 @@ type ChannelPartnerLink struct {
 	// Output only. URI of the web page where partner accepts the link invitation.
 	InviteLinkUri string `protobuf:"bytes,4,opt,name=invite_link_uri,json=inviteLinkUri,proto3" json:"invite_link_uri,omitempty"`
 	// Output only. Timestamp of when the channel partner link is created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp of when the channel partner link is updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Public identifier that a customer must use to generate a transfer token
 	// to move to this distributor-reseller combination.
 	PublicId string `protobuf:"bytes,7,opt,name=public_id,json=publicId,proto3" json:"public_id,omitempty"`
@@ -241,14 +241,14 @@ func (x *ChannelPartnerLink) GetInviteLinkUri() string {
 	return ""
 }
 
-func (x *ChannelPartnerLink) GetCreateTime() *timestamp.Timestamp {
+func (x *ChannelPartnerLink) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ChannelPartnerLink) GetUpdateTime() *timestamp.Timestamp {
+func (x *ChannelPartnerLink) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -363,11 +363,11 @@ func file_google_cloud_channel_v1_channel_partner_links_proto_rawDescGZIP() []by
 var file_google_cloud_channel_v1_channel_partner_links_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
 var file_google_cloud_channel_v1_channel_partner_links_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_channel_v1_channel_partner_links_proto_goTypes = []interface{}{
-	(ChannelPartnerLinkView)(0),  // 0: google.cloud.channel.v1.ChannelPartnerLinkView
-	(ChannelPartnerLinkState)(0), // 1: google.cloud.channel.v1.ChannelPartnerLinkState
-	(*ChannelPartnerLink)(nil),   // 2: google.cloud.channel.v1.ChannelPartnerLink
-	(*timestamp.Timestamp)(nil),  // 3: google.protobuf.Timestamp
-	(*CloudIdentityInfo)(nil),    // 4: google.cloud.channel.v1.CloudIdentityInfo
+	(ChannelPartnerLinkView)(0),   // 0: google.cloud.channel.v1.ChannelPartnerLinkView
+	(ChannelPartnerLinkState)(0),  // 1: google.cloud.channel.v1.ChannelPartnerLinkState
+	(*ChannelPartnerLink)(nil),    // 2: google.cloud.channel.v1.ChannelPartnerLink
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(*CloudIdentityInfo)(nil),     // 4: google.cloud.channel.v1.CloudIdentityInfo
 }
 var file_google_cloud_channel_v1_channel_partner_links_proto_depIdxs = []int32{
 	1, // 0: google.cloud.channel.v1.ChannelPartnerLink.link_state:type_name -> google.cloud.channel.v1.ChannelPartnerLinkState
diff --git a/channel/apiv1/channelpb/common.pb.go b/channel/apiv1/channelpb/common.pb.go
index 9392d1e23f2..35345151f6a 100644
--- a/channel/apiv1/channelpb/common.pb.go
+++ b/channel/apiv1/channelpb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/common.proto
 
 package channelpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
 )
 
 const (
@@ -477,7 +477,7 @@ func (x *Value) GetDoubleValue() float64 {
 	return 0
 }
 
-func (x *Value) GetProtoValue() *any1.Any {
+func (x *Value) GetProtoValue() *anypb.Any {
 	if x, ok := x.GetKind().(*Value_ProtoValue); ok {
 		return x.ProtoValue
 	}
@@ -512,7 +512,7 @@ type Value_DoubleValue struct {
 
 type Value_ProtoValue struct {
 	// Represents an 'Any' proto value.
-	ProtoValue *any1.Any `protobuf:"bytes,4,opt,name=proto_value,json=protoValue,proto3,oneof"`
+	ProtoValue *anypb.Any `protobuf:"bytes,4,opt,name=proto_value,json=protoValue,proto3,oneof"`
 }
 
 type Value_BoolValue struct {
@@ -720,7 +720,7 @@ var file_google_cloud_channel_v1_common_proto_goTypes = []interface{}{
 	(*CloudIdentityInfo)(nil),           // 4: google.cloud.channel.v1.CloudIdentityInfo
 	(*Value)(nil),                       // 5: google.cloud.channel.v1.Value
 	(*AdminUser)(nil),                   // 6: google.cloud.channel.v1.AdminUser
-	(*any1.Any)(nil),                    // 7: google.protobuf.Any
+	(*anypb.Any)(nil),                   // 7: google.protobuf.Any
 }
 var file_google_cloud_channel_v1_common_proto_depIdxs = []int32{
 	0, // 0: google.cloud.channel.v1.EduData.institute_type:type_name -> google.cloud.channel.v1.EduData.InstituteType
diff --git a/channel/apiv1/channelpb/customers.pb.go b/channel/apiv1/channelpb/customers.pb.go
index dad0cc5cfb8..3c6045c1b65 100644
--- a/channel/apiv1/channelpb/customers.pb.go
+++ b/channel/apiv1/channelpb/customers.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/customers.proto
 
 package channelpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	postaladdress "google.golang.org/genproto/googleapis/type/postaladdress"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -66,9 +66,9 @@ type Customer struct {
 	// email's domain.
 	Domain string `protobuf:"bytes,6,opt,name=domain,proto3" json:"domain,omitempty"`
 	// Output only. Time when the customer was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time when the customer was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The customer's Cloud Identity ID if the customer has a Cloud
 	// Identity resource.
 	CloudIdentityId string `protobuf:"bytes,9,opt,name=cloud_identity_id,json=cloudIdentityId,proto3" json:"cloud_identity_id,omitempty"`
@@ -158,14 +158,14 @@ func (x *Customer) GetDomain() string {
 	return ""
 }
 
-func (x *Customer) GetCreateTime() *timestamp.Timestamp {
+func (x *Customer) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Customer) GetUpdateTime() *timestamp.Timestamp {
+func (x *Customer) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -401,7 +401,7 @@ var file_google_cloud_channel_v1_customers_proto_goTypes = []interface{}{
 	(*Customer)(nil),                    // 0: google.cloud.channel.v1.Customer
 	(*ContactInfo)(nil),                 // 1: google.cloud.channel.v1.ContactInfo
 	(*postaladdress.PostalAddress)(nil), // 2: google.type.PostalAddress
-	(*timestamp.Timestamp)(nil),         // 3: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),       // 3: google.protobuf.Timestamp
 	(*CloudIdentityInfo)(nil),           // 4: google.cloud.channel.v1.CloudIdentityInfo
 }
 var file_google_cloud_channel_v1_customers_proto_depIdxs = []int32{
diff --git a/channel/apiv1/channelpb/entitlements.pb.go b/channel/apiv1/channelpb/entitlements.pb.go
index 8eecf826a19..9cd7d713b04 100644
--- a/channel/apiv1/channelpb/entitlements.pb.go
+++ b/channel/apiv1/channelpb/entitlements.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/entitlements.proto
 
 package channelpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -223,9 +223,9 @@ type Entitlement struct {
 	// accounts/{account_id}/customers/{customer_id}/entitlements/{entitlement_id}.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time at which the entitlement is created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which the entitlement is updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Required. The offer resource name for which the entitlement is to be
 	// created. Takes the form: accounts/{account_id}/offers/{offer_id}.
 	Offer string `protobuf:"bytes,8,opt,name=offer,proto3" json:"offer,omitempty"`
@@ -301,14 +301,14 @@ func (x *Entitlement) GetName() string {
 	return ""
 }
 
-func (x *Entitlement) GetCreateTime() *timestamp.Timestamp {
+func (x *Entitlement) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Entitlement) GetUpdateTime() *timestamp.Timestamp {
+func (x *Entitlement) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -573,9 +573,9 @@ type CommitmentSettings struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. Commitment start timestamp.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. Commitment end timestamp.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Optional. Renewal settings applicable for a commitment-based Offer.
 	RenewalSettings *RenewalSettings `protobuf:"bytes,4,opt,name=renewal_settings,json=renewalSettings,proto3" json:"renewal_settings,omitempty"`
 }
@@ -612,14 +612,14 @@ func (*CommitmentSettings) Descriptor() ([]byte, []int) {
 	return file_google_cloud_channel_v1_entitlements_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *CommitmentSettings) GetStartTime() *timestamp.Timestamp {
+func (x *CommitmentSettings) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *CommitmentSettings) GetEndTime() *timestamp.Timestamp {
+func (x *CommitmentSettings) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -725,7 +725,7 @@ type TrialSettings struct {
 	// Date when the trial ends. The value is in milliseconds
 	// using the UNIX Epoch format. See an example [Epoch
 	// converter](https://www.epochconverter.com).
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *TrialSettings) Reset() {
@@ -767,7 +767,7 @@ func (x *TrialSettings) GetTrial() bool {
 	return false
 }
 
-func (x *TrialSettings) GetEndTime() *timestamp.Timestamp {
+func (x *TrialSettings) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1140,7 +1140,7 @@ var file_google_cloud_channel_v1_entitlements_proto_goTypes = []interface{}{
 	(*TrialSettings)(nil),              // 9: google.cloud.channel.v1.TrialSettings
 	(*TransferableSku)(nil),            // 10: google.cloud.channel.v1.TransferableSku
 	(*TransferEligibility)(nil),        // 11: google.cloud.channel.v1.TransferEligibility
-	(*timestamp.Timestamp)(nil),        // 12: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),      // 12: google.protobuf.Timestamp
 	(*Value)(nil),                      // 13: google.cloud.channel.v1.Value
 	(PaymentPlan)(0),                   // 14: google.cloud.channel.v1.PaymentPlan
 	(*Period)(nil),                     // 15: google.cloud.channel.v1.Period
diff --git a/channel/apiv1/channelpb/offers.pb.go b/channel/apiv1/channelpb/offers.pb.go
index 306887c2221..3921ff5b90c 100644
--- a/channel/apiv1/channelpb/offers.pb.go
+++ b/channel/apiv1/channelpb/offers.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/offers.proto
 
 package channelpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	money "google.golang.org/genproto/googleapis/type/money"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -428,9 +428,9 @@ type Offer struct {
 	// Price for each monetizable resource type.
 	PriceByResources []*PriceByResource `protobuf:"bytes,6,rep,name=price_by_resources,json=priceByResources,proto3" json:"price_by_resources,omitempty"`
 	// Start of the Offer validity time.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. End of the Offer validity time.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Parameters required to use current Offer to purchase.
 	ParameterDefinitions []*ParameterDefinition `protobuf:"bytes,9,rep,name=parameter_definitions,json=parameterDefinitions,proto3" json:"parameter_definitions,omitempty"`
 }
@@ -509,14 +509,14 @@ func (x *Offer) GetPriceByResources() []*PriceByResource {
 	return nil
 }
 
-func (x *Offer) GetStartTime() *timestamp.Timestamp {
+func (x *Offer) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Offer) GetEndTime() *timestamp.Timestamp {
+func (x *Offer) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1470,7 +1470,7 @@ var file_google_cloud_channel_v1_offers_proto_goTypes = []interface{}{
 	(*Period)(nil),                         // 15: google.cloud.channel.v1.Period
 	(*MarketingInfo)(nil),                  // 16: google.cloud.channel.v1.MarketingInfo
 	(*Sku)(nil),                            // 17: google.cloud.channel.v1.Sku
-	(*timestamp.Timestamp)(nil),            // 18: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 18: google.protobuf.Timestamp
 	(*Value)(nil),                          // 19: google.cloud.channel.v1.Value
 	(CloudIdentityInfo_CustomerType)(0),    // 20: google.cloud.channel.v1.CloudIdentityInfo.CustomerType
 	(*money.Money)(nil),                    // 21: google.type.Money
diff --git a/channel/apiv1/channelpb/operations.pb.go b/channel/apiv1/channelpb/operations.pb.go
index 4900c706f42..6f129c4c8c7 100644
--- a/channel/apiv1/channelpb/operations.pb.go
+++ b/channel/apiv1/channelpb/operations.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/operations.proto
 
 package channelpb
diff --git a/channel/apiv1/channelpb/products.pb.go b/channel/apiv1/channelpb/products.pb.go
index 7356fe6fdf0..639aaa8a4b4 100644
--- a/channel/apiv1/channelpb/products.pb.go
+++ b/channel/apiv1/channelpb/products.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/products.proto
 
 package channelpb
diff --git a/channel/apiv1/channelpb/reports_service.pb.go b/channel/apiv1/channelpb/reports_service.pb.go
index 948be95dfc3..cf10e2a36c7 100644
--- a/channel/apiv1/channelpb/reports_service.pb.go
+++ b/channel/apiv1/channelpb/reports_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/reports_service.proto
 
 package channelpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	date "google.golang.org/genproto/googleapis/type/date"
@@ -37,6 +36,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1139,9 +1139,9 @@ type ReportStatus struct {
 	// The current state of the report generation process.
 	State ReportStatus_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.channel.v1.ReportStatus_State" json:"state,omitempty"`
 	// The report generation's start time.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The report generation's completion time.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *ReportStatus) Reset() {
@@ -1183,14 +1183,14 @@ func (x *ReportStatus) GetState() ReportStatus_State {
 	return ReportStatus_STATE_UNSPECIFIED
 }
 
-func (x *ReportStatus) GetStartTime() *timestamp.Timestamp {
+func (x *ReportStatus) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *ReportStatus) GetEndTime() *timestamp.Timestamp {
+func (x *ReportStatus) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1583,7 +1583,7 @@ var file_google_cloud_channel_v1_reports_service_proto_goTypes = []interface{}{
 	(*date.Date)(nil),                  // 17: google.type.Date
 	(*decimal.Decimal)(nil),            // 18: google.type.Decimal
 	(*money.Money)(nil),                // 19: google.type.Money
-	(*timestamp.Timestamp)(nil),        // 20: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),      // 20: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),      // 21: google.longrunning.Operation
 }
 var file_google_cloud_channel_v1_reports_service_proto_depIdxs = []int32{
diff --git a/channel/apiv1/channelpb/repricing.pb.go b/channel/apiv1/channelpb/repricing.pb.go
index 48b66053412..7d0f3e3a002 100644
--- a/channel/apiv1/channelpb/repricing.pb.go
+++ b/channel/apiv1/channelpb/repricing.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/repricing.proto
 
 package channelpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	date "google.golang.org/genproto/googleapis/type/date"
 	decimal "google.golang.org/genproto/googleapis/type/decimal"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -111,7 +111,7 @@ type CustomerRepricingConfig struct {
 	// Output only. Timestamp of an update to the repricing rule. If `update_time` is after
 	// [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month] then it indicates this was set
 	// mid-month.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *CustomerRepricingConfig) Reset() {
@@ -160,7 +160,7 @@ func (x *CustomerRepricingConfig) GetRepricingConfig() *RepricingConfig {
 	return nil
 }
 
-func (x *CustomerRepricingConfig) GetUpdateTime() *timestamp.Timestamp {
+func (x *CustomerRepricingConfig) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -184,7 +184,7 @@ type ChannelPartnerRepricingConfig struct {
 	// Output only. Timestamp of an update to the repricing rule. If `update_time` is after
 	// [RepricingConfig.effective_invoice_month][google.cloud.channel.v1.RepricingConfig.effective_invoice_month] then it indicates this was set
 	// mid-month.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *ChannelPartnerRepricingConfig) Reset() {
@@ -233,7 +233,7 @@ func (x *ChannelPartnerRepricingConfig) GetRepricingConfig() *RepricingConfig {
 	return nil
 }
 
-func (x *ChannelPartnerRepricingConfig) GetUpdateTime() *timestamp.Timestamp {
+func (x *ChannelPartnerRepricingConfig) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -732,7 +732,7 @@ var file_google_cloud_channel_v1_repricing_proto_goTypes = []interface{}{
 	(*PercentageAdjustment)(nil),                      // 5: google.cloud.channel.v1.PercentageAdjustment
 	(*RepricingConfig_EntitlementGranularity)(nil),    // 6: google.cloud.channel.v1.RepricingConfig.EntitlementGranularity
 	(*RepricingConfig_ChannelPartnerGranularity)(nil), // 7: google.cloud.channel.v1.RepricingConfig.ChannelPartnerGranularity
-	(*timestamp.Timestamp)(nil),                       // 8: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                     // 8: google.protobuf.Timestamp
 	(*date.Date)(nil),                                 // 9: google.type.Date
 	(*decimal.Decimal)(nil),                           // 10: google.type.Decimal
 }
diff --git a/channel/apiv1/channelpb/service.pb.go b/channel/apiv1/channelpb/service.pb.go
index 6aba841634f..ccae47f084d 100644
--- a/channel/apiv1/channelpb/service.pb.go
+++ b/channel/apiv1/channelpb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/service.proto
 
 package channelpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -548,7 +548,7 @@ type UpdateCustomerRequest struct {
 	Customer *Customer `protobuf:"bytes,2,opt,name=customer,proto3" json:"customer,omitempty"`
 	// The update mask that applies to the resource.
 	// Optional.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCustomerRequest) Reset() {
@@ -590,7 +590,7 @@ func (x *UpdateCustomerRequest) GetCustomer() *Customer {
 	return nil
 }
 
-func (x *UpdateCustomerRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCustomerRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1798,7 +1798,7 @@ type UpdateChannelPartnerLinkRequest struct {
 	// Required. The update mask that applies to the resource.
 	// The only allowable value for an update mask is
 	// channel_partner_link.link_state.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateChannelPartnerLinkRequest) Reset() {
@@ -1847,7 +1847,7 @@ func (x *UpdateChannelPartnerLinkRequest) GetChannelPartnerLink() *ChannelPartne
 	return nil
 }
 
-func (x *UpdateChannelPartnerLinkRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateChannelPartnerLinkRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -6448,7 +6448,7 @@ var file_google_cloud_channel_v1_service_proto_goTypes = []interface{}{
 	(*ListPurchasableOffersRequest_CreateEntitlementPurchase)(nil), // 69: google.cloud.channel.v1.ListPurchasableOffersRequest.CreateEntitlementPurchase
 	(*ListPurchasableOffersRequest_ChangeOfferPurchase)(nil),       // 70: google.cloud.channel.v1.ListPurchasableOffersRequest.ChangeOfferPurchase
 	(*Customer)(nil),                                               // 71: google.cloud.channel.v1.Customer
-	(*field_mask.FieldMask)(nil),                                   // 72: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                                  // 72: google.protobuf.FieldMask
 	(*CloudIdentityInfo)(nil),                                      // 73: google.cloud.channel.v1.CloudIdentityInfo
 	(*AdminUser)(nil),                                              // 74: google.cloud.channel.v1.AdminUser
 	(*Entitlement)(nil),                                            // 75: google.cloud.channel.v1.Entitlement
@@ -6462,7 +6462,7 @@ var file_google_cloud_channel_v1_service_proto_goTypes = []interface{}{
 	(*RenewalSettings)(nil),                                        // 83: google.cloud.channel.v1.RenewalSettings
 	(*Product)(nil),                                                // 84: google.cloud.channel.v1.Product
 	(*Sku)(nil),                                                    // 85: google.cloud.channel.v1.Sku
-	(*empty.Empty)(nil),                                            // 86: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                          // 86: google.protobuf.Empty
 	(*longrunning.Operation)(nil),                                  // 87: google.longrunning.Operation
 }
 var file_google_cloud_channel_v1_service_proto_depIdxs = []int32{
@@ -7589,7 +7589,7 @@ type CloudChannelServiceClient interface {
 	// * INVALID_ARGUMENT: Required request parameters are missing or invalid.
 	// * FAILED_PRECONDITION: The customer has existing entitlements.
 	// * NOT_FOUND: No [Customer][google.cloud.channel.v1.Customer] resource found for the name in the request.
-	DeleteCustomer(ctx context.Context, in *DeleteCustomerRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteCustomer(ctx context.Context, in *DeleteCustomerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Imports a [Customer][google.cloud.channel.v1.Customer] from the Cloud Identity associated with the provided
 	// Cloud Identity ID or domain before a TransferEntitlements call. If a
 	// linked Customer already exists and overwrite_if_exists is true, it will
@@ -8158,7 +8158,7 @@ type CloudChannelServiceClient interface {
 	// past.
 	// * NOT_FOUND: No [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig] found for the name in the
 	// request.
-	DeleteCustomerRepricingConfig(ctx context.Context, in *DeleteCustomerRepricingConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteCustomerRepricingConfig(ctx context.Context, in *DeleteCustomerRepricingConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets information about how a Distributor modifies their bill before sending
 	// it to a ChannelPartner.
 	//
@@ -8276,7 +8276,7 @@ type CloudChannelServiceClient interface {
 	// in the past.
 	// * NOT_FOUND: No [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig] found for the name in the
 	// request.
-	DeleteChannelPartnerRepricingConfig(ctx context.Context, in *DeleteChannelPartnerRepricingConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteChannelPartnerRepricingConfig(ctx context.Context, in *DeleteChannelPartnerRepricingConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Returns the requested [Offer][google.cloud.channel.v1.Offer] resource.
 	//
 	// Possible error codes:
@@ -8439,8 +8439,8 @@ func (c *cloudChannelServiceClient) UpdateCustomer(ctx context.Context, in *Upda
 	return out, nil
 }
 
-func (c *cloudChannelServiceClient) DeleteCustomer(ctx context.Context, in *DeleteCustomerRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *cloudChannelServiceClient) DeleteCustomer(ctx context.Context, in *DeleteCustomerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.channel.v1.CloudChannelService/DeleteCustomer", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -8664,8 +8664,8 @@ func (c *cloudChannelServiceClient) UpdateCustomerRepricingConfig(ctx context.Co
 	return out, nil
 }
 
-func (c *cloudChannelServiceClient) DeleteCustomerRepricingConfig(ctx context.Context, in *DeleteCustomerRepricingConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *cloudChannelServiceClient) DeleteCustomerRepricingConfig(ctx context.Context, in *DeleteCustomerRepricingConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.channel.v1.CloudChannelService/DeleteCustomerRepricingConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -8709,8 +8709,8 @@ func (c *cloudChannelServiceClient) UpdateChannelPartnerRepricingConfig(ctx cont
 	return out, nil
 }
 
-func (c *cloudChannelServiceClient) DeleteChannelPartnerRepricingConfig(ctx context.Context, in *DeleteChannelPartnerRepricingConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *cloudChannelServiceClient) DeleteChannelPartnerRepricingConfig(ctx context.Context, in *DeleteChannelPartnerRepricingConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.channel.v1.CloudChannelService/DeleteChannelPartnerRepricingConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -8878,7 +8878,7 @@ type CloudChannelServiceServer interface {
 	// * INVALID_ARGUMENT: Required request parameters are missing or invalid.
 	// * FAILED_PRECONDITION: The customer has existing entitlements.
 	// * NOT_FOUND: No [Customer][google.cloud.channel.v1.Customer] resource found for the name in the request.
-	DeleteCustomer(context.Context, *DeleteCustomerRequest) (*empty.Empty, error)
+	DeleteCustomer(context.Context, *DeleteCustomerRequest) (*emptypb.Empty, error)
 	// Imports a [Customer][google.cloud.channel.v1.Customer] from the Cloud Identity associated with the provided
 	// Cloud Identity ID or domain before a TransferEntitlements call. If a
 	// linked Customer already exists and overwrite_if_exists is true, it will
@@ -9447,7 +9447,7 @@ type CloudChannelServiceServer interface {
 	// past.
 	// * NOT_FOUND: No [CustomerRepricingConfig][google.cloud.channel.v1.CustomerRepricingConfig] found for the name in the
 	// request.
-	DeleteCustomerRepricingConfig(context.Context, *DeleteCustomerRepricingConfigRequest) (*empty.Empty, error)
+	DeleteCustomerRepricingConfig(context.Context, *DeleteCustomerRepricingConfigRequest) (*emptypb.Empty, error)
 	// Gets information about how a Distributor modifies their bill before sending
 	// it to a ChannelPartner.
 	//
@@ -9565,7 +9565,7 @@ type CloudChannelServiceServer interface {
 	// in the past.
 	// * NOT_FOUND: No [ChannelPartnerRepricingConfig][google.cloud.channel.v1.ChannelPartnerRepricingConfig] found for the name in the
 	// request.
-	DeleteChannelPartnerRepricingConfig(context.Context, *DeleteChannelPartnerRepricingConfigRequest) (*empty.Empty, error)
+	DeleteChannelPartnerRepricingConfig(context.Context, *DeleteChannelPartnerRepricingConfigRequest) (*emptypb.Empty, error)
 	// Returns the requested [Offer][google.cloud.channel.v1.Offer] resource.
 	//
 	// Possible error codes:
@@ -9694,7 +9694,7 @@ func (*UnimplementedCloudChannelServiceServer) CreateCustomer(context.Context, *
 func (*UnimplementedCloudChannelServiceServer) UpdateCustomer(context.Context, *UpdateCustomerRequest) (*Customer, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateCustomer not implemented")
 }
-func (*UnimplementedCloudChannelServiceServer) DeleteCustomer(context.Context, *DeleteCustomerRequest) (*empty.Empty, error) {
+func (*UnimplementedCloudChannelServiceServer) DeleteCustomer(context.Context, *DeleteCustomerRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteCustomer not implemented")
 }
 func (*UnimplementedCloudChannelServiceServer) ImportCustomer(context.Context, *ImportCustomerRequest) (*Customer, error) {
@@ -9769,7 +9769,7 @@ func (*UnimplementedCloudChannelServiceServer) CreateCustomerRepricingConfig(con
 func (*UnimplementedCloudChannelServiceServer) UpdateCustomerRepricingConfig(context.Context, *UpdateCustomerRepricingConfigRequest) (*CustomerRepricingConfig, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateCustomerRepricingConfig not implemented")
 }
-func (*UnimplementedCloudChannelServiceServer) DeleteCustomerRepricingConfig(context.Context, *DeleteCustomerRepricingConfigRequest) (*empty.Empty, error) {
+func (*UnimplementedCloudChannelServiceServer) DeleteCustomerRepricingConfig(context.Context, *DeleteCustomerRepricingConfigRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteCustomerRepricingConfig not implemented")
 }
 func (*UnimplementedCloudChannelServiceServer) GetChannelPartnerRepricingConfig(context.Context, *GetChannelPartnerRepricingConfigRequest) (*ChannelPartnerRepricingConfig, error) {
@@ -9784,7 +9784,7 @@ func (*UnimplementedCloudChannelServiceServer) CreateChannelPartnerRepricingConf
 func (*UnimplementedCloudChannelServiceServer) UpdateChannelPartnerRepricingConfig(context.Context, *UpdateChannelPartnerRepricingConfigRequest) (*ChannelPartnerRepricingConfig, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateChannelPartnerRepricingConfig not implemented")
 }
-func (*UnimplementedCloudChannelServiceServer) DeleteChannelPartnerRepricingConfig(context.Context, *DeleteChannelPartnerRepricingConfigRequest) (*empty.Empty, error) {
+func (*UnimplementedCloudChannelServiceServer) DeleteChannelPartnerRepricingConfig(context.Context, *DeleteChannelPartnerRepricingConfigRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteChannelPartnerRepricingConfig not implemented")
 }
 func (*UnimplementedCloudChannelServiceServer) LookupOffer(context.Context, *LookupOfferRequest) (*Offer, error) {
diff --git a/channel/apiv1/channelpb/subscriber_event.pb.go b/channel/apiv1/channelpb/subscriber_event.pb.go
index 5297d249e99..bfed5127906 100644
--- a/channel/apiv1/channelpb/subscriber_event.pb.go
+++ b/channel/apiv1/channelpb/subscriber_event.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/channel/v1/subscriber_event.proto
 
 package channelpb
diff --git a/channel/apiv1/cloud_channel_client.go b/channel/apiv1/cloud_channel_client.go
index efbd3bdc170..89ec19da050 100644
--- a/channel/apiv1/cloud_channel_client.go
+++ b/channel/apiv1/cloud_channel_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/channel/apiv1/cloud_channel_client_example_test.go b/channel/apiv1/cloud_channel_client_example_test.go
index 5131b7abf0a..c69fe9e819f 100644
--- a/channel/apiv1/cloud_channel_client_example_test.go
+++ b/channel/apiv1/cloud_channel_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleCloudChannelClient_ListCustomers() {
 
 	req := &channelpb.ListCustomersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListCustomersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListCustomersRequest.
 	}
 	it := c.ListCustomers(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleCloudChannelClient_GetCustomer() {
 
 	req := &channelpb.GetCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetCustomerRequest.
 	}
 	resp, err := c.GetCustomer(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleCloudChannelClient_CheckCloudIdentityAccountsExist() {
 
 	req := &channelpb.CheckCloudIdentityAccountsExistRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CheckCloudIdentityAccountsExistRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CheckCloudIdentityAccountsExistRequest.
 	}
 	resp, err := c.CheckCloudIdentityAccountsExist(ctx, req)
 	if err != nil {
@@ -138,7 +138,7 @@ func ExampleCloudChannelClient_CreateCustomer() {
 
 	req := &channelpb.CreateCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateCustomerRequest.
 	}
 	resp, err := c.CreateCustomer(ctx, req)
 	if err != nil {
@@ -163,7 +163,7 @@ func ExampleCloudChannelClient_UpdateCustomer() {
 
 	req := &channelpb.UpdateCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UpdateCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UpdateCustomerRequest.
 	}
 	resp, err := c.UpdateCustomer(ctx, req)
 	if err != nil {
@@ -188,7 +188,7 @@ func ExampleCloudChannelClient_DeleteCustomer() {
 
 	req := &channelpb.DeleteCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#DeleteCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#DeleteCustomerRequest.
 	}
 	err = c.DeleteCustomer(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExampleCloudChannelClient_ImportCustomer() {
 
 	req := &channelpb.ImportCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ImportCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ImportCustomerRequest.
 	}
 	resp, err := c.ImportCustomer(ctx, req)
 	if err != nil {
@@ -236,7 +236,7 @@ func ExampleCloudChannelClient_ProvisionCloudIdentity() {
 
 	req := &channelpb.ProvisionCloudIdentityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ProvisionCloudIdentityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ProvisionCloudIdentityRequest.
 	}
 	op, err := c.ProvisionCloudIdentity(ctx, req)
 	if err != nil {
@@ -266,7 +266,7 @@ func ExampleCloudChannelClient_ListEntitlements() {
 
 	req := &channelpb.ListEntitlementsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListEntitlementsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListEntitlementsRequest.
 	}
 	it := c.ListEntitlements(ctx, req)
 	for {
@@ -297,7 +297,7 @@ func ExampleCloudChannelClient_ListTransferableSkus() {
 
 	req := &channelpb.ListTransferableSkusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListTransferableSkusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListTransferableSkusRequest.
 	}
 	it := c.ListTransferableSkus(ctx, req)
 	for {
@@ -328,7 +328,7 @@ func ExampleCloudChannelClient_ListTransferableOffers() {
 
 	req := &channelpb.ListTransferableOffersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListTransferableOffersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListTransferableOffersRequest.
 	}
 	it := c.ListTransferableOffers(ctx, req)
 	for {
@@ -359,7 +359,7 @@ func ExampleCloudChannelClient_GetEntitlement() {
 
 	req := &channelpb.GetEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetEntitlementRequest.
 	}
 	resp, err := c.GetEntitlement(ctx, req)
 	if err != nil {
@@ -384,7 +384,7 @@ func ExampleCloudChannelClient_CreateEntitlement() {
 
 	req := &channelpb.CreateEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateEntitlementRequest.
 	}
 	op, err := c.CreateEntitlement(ctx, req)
 	if err != nil {
@@ -414,7 +414,7 @@ func ExampleCloudChannelClient_ChangeParameters() {
 
 	req := &channelpb.ChangeParametersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ChangeParametersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ChangeParametersRequest.
 	}
 	op, err := c.ChangeParameters(ctx, req)
 	if err != nil {
@@ -444,7 +444,7 @@ func ExampleCloudChannelClient_ChangeRenewalSettings() {
 
 	req := &channelpb.ChangeRenewalSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ChangeRenewalSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ChangeRenewalSettingsRequest.
 	}
 	op, err := c.ChangeRenewalSettings(ctx, req)
 	if err != nil {
@@ -474,7 +474,7 @@ func ExampleCloudChannelClient_ChangeOffer() {
 
 	req := &channelpb.ChangeOfferRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ChangeOfferRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ChangeOfferRequest.
 	}
 	op, err := c.ChangeOffer(ctx, req)
 	if err != nil {
@@ -504,7 +504,7 @@ func ExampleCloudChannelClient_StartPaidService() {
 
 	req := &channelpb.StartPaidServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#StartPaidServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#StartPaidServiceRequest.
 	}
 	op, err := c.StartPaidService(ctx, req)
 	if err != nil {
@@ -534,7 +534,7 @@ func ExampleCloudChannelClient_SuspendEntitlement() {
 
 	req := &channelpb.SuspendEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#SuspendEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#SuspendEntitlementRequest.
 	}
 	op, err := c.SuspendEntitlement(ctx, req)
 	if err != nil {
@@ -564,7 +564,7 @@ func ExampleCloudChannelClient_CancelEntitlement() {
 
 	req := &channelpb.CancelEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CancelEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CancelEntitlementRequest.
 	}
 	op, err := c.CancelEntitlement(ctx, req)
 	if err != nil {
@@ -592,7 +592,7 @@ func ExampleCloudChannelClient_ActivateEntitlement() {
 
 	req := &channelpb.ActivateEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ActivateEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ActivateEntitlementRequest.
 	}
 	op, err := c.ActivateEntitlement(ctx, req)
 	if err != nil {
@@ -622,7 +622,7 @@ func ExampleCloudChannelClient_TransferEntitlements() {
 
 	req := &channelpb.TransferEntitlementsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#TransferEntitlementsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#TransferEntitlementsRequest.
 	}
 	op, err := c.TransferEntitlements(ctx, req)
 	if err != nil {
@@ -652,7 +652,7 @@ func ExampleCloudChannelClient_TransferEntitlementsToGoogle() {
 
 	req := &channelpb.TransferEntitlementsToGoogleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#TransferEntitlementsToGoogleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#TransferEntitlementsToGoogleRequest.
 	}
 	op, err := c.TransferEntitlementsToGoogle(ctx, req)
 	if err != nil {
@@ -680,7 +680,7 @@ func ExampleCloudChannelClient_ListChannelPartnerLinks() {
 
 	req := &channelpb.ListChannelPartnerLinksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListChannelPartnerLinksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListChannelPartnerLinksRequest.
 	}
 	it := c.ListChannelPartnerLinks(ctx, req)
 	for {
@@ -711,7 +711,7 @@ func ExampleCloudChannelClient_GetChannelPartnerLink() {
 
 	req := &channelpb.GetChannelPartnerLinkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetChannelPartnerLinkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetChannelPartnerLinkRequest.
 	}
 	resp, err := c.GetChannelPartnerLink(ctx, req)
 	if err != nil {
@@ -736,7 +736,7 @@ func ExampleCloudChannelClient_CreateChannelPartnerLink() {
 
 	req := &channelpb.CreateChannelPartnerLinkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateChannelPartnerLinkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateChannelPartnerLinkRequest.
 	}
 	resp, err := c.CreateChannelPartnerLink(ctx, req)
 	if err != nil {
@@ -761,7 +761,7 @@ func ExampleCloudChannelClient_UpdateChannelPartnerLink() {
 
 	req := &channelpb.UpdateChannelPartnerLinkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UpdateChannelPartnerLinkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UpdateChannelPartnerLinkRequest.
 	}
 	resp, err := c.UpdateChannelPartnerLink(ctx, req)
 	if err != nil {
@@ -786,7 +786,7 @@ func ExampleCloudChannelClient_GetCustomerRepricingConfig() {
 
 	req := &channelpb.GetCustomerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetCustomerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetCustomerRepricingConfigRequest.
 	}
 	resp, err := c.GetCustomerRepricingConfig(ctx, req)
 	if err != nil {
@@ -811,7 +811,7 @@ func ExampleCloudChannelClient_ListCustomerRepricingConfigs() {
 
 	req := &channelpb.ListCustomerRepricingConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListCustomerRepricingConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListCustomerRepricingConfigsRequest.
 	}
 	it := c.ListCustomerRepricingConfigs(ctx, req)
 	for {
@@ -842,7 +842,7 @@ func ExampleCloudChannelClient_CreateCustomerRepricingConfig() {
 
 	req := &channelpb.CreateCustomerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateCustomerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateCustomerRepricingConfigRequest.
 	}
 	resp, err := c.CreateCustomerRepricingConfig(ctx, req)
 	if err != nil {
@@ -867,7 +867,7 @@ func ExampleCloudChannelClient_UpdateCustomerRepricingConfig() {
 
 	req := &channelpb.UpdateCustomerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UpdateCustomerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UpdateCustomerRepricingConfigRequest.
 	}
 	resp, err := c.UpdateCustomerRepricingConfig(ctx, req)
 	if err != nil {
@@ -892,7 +892,7 @@ func ExampleCloudChannelClient_DeleteCustomerRepricingConfig() {
 
 	req := &channelpb.DeleteCustomerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#DeleteCustomerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#DeleteCustomerRepricingConfigRequest.
 	}
 	err = c.DeleteCustomerRepricingConfig(ctx, req)
 	if err != nil {
@@ -915,7 +915,7 @@ func ExampleCloudChannelClient_GetChannelPartnerRepricingConfig() {
 
 	req := &channelpb.GetChannelPartnerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetChannelPartnerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetChannelPartnerRepricingConfigRequest.
 	}
 	resp, err := c.GetChannelPartnerRepricingConfig(ctx, req)
 	if err != nil {
@@ -940,7 +940,7 @@ func ExampleCloudChannelClient_ListChannelPartnerRepricingConfigs() {
 
 	req := &channelpb.ListChannelPartnerRepricingConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListChannelPartnerRepricingConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListChannelPartnerRepricingConfigsRequest.
 	}
 	it := c.ListChannelPartnerRepricingConfigs(ctx, req)
 	for {
@@ -971,7 +971,7 @@ func ExampleCloudChannelClient_CreateChannelPartnerRepricingConfig() {
 
 	req := &channelpb.CreateChannelPartnerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateChannelPartnerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateChannelPartnerRepricingConfigRequest.
 	}
 	resp, err := c.CreateChannelPartnerRepricingConfig(ctx, req)
 	if err != nil {
@@ -996,7 +996,7 @@ func ExampleCloudChannelClient_UpdateChannelPartnerRepricingConfig() {
 
 	req := &channelpb.UpdateChannelPartnerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UpdateChannelPartnerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UpdateChannelPartnerRepricingConfigRequest.
 	}
 	resp, err := c.UpdateChannelPartnerRepricingConfig(ctx, req)
 	if err != nil {
@@ -1021,7 +1021,7 @@ func ExampleCloudChannelClient_DeleteChannelPartnerRepricingConfig() {
 
 	req := &channelpb.DeleteChannelPartnerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#DeleteChannelPartnerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#DeleteChannelPartnerRepricingConfigRequest.
 	}
 	err = c.DeleteChannelPartnerRepricingConfig(ctx, req)
 	if err != nil {
@@ -1044,7 +1044,7 @@ func ExampleCloudChannelClient_LookupOffer() {
 
 	req := &channelpb.LookupOfferRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#LookupOfferRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#LookupOfferRequest.
 	}
 	resp, err := c.LookupOffer(ctx, req)
 	if err != nil {
@@ -1069,7 +1069,7 @@ func ExampleCloudChannelClient_ListProducts() {
 
 	req := &channelpb.ListProductsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListProductsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListProductsRequest.
 	}
 	it := c.ListProducts(ctx, req)
 	for {
@@ -1100,7 +1100,7 @@ func ExampleCloudChannelClient_ListSkus() {
 
 	req := &channelpb.ListSkusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListSkusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListSkusRequest.
 	}
 	it := c.ListSkus(ctx, req)
 	for {
@@ -1131,7 +1131,7 @@ func ExampleCloudChannelClient_ListOffers() {
 
 	req := &channelpb.ListOffersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListOffersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListOffersRequest.
 	}
 	it := c.ListOffers(ctx, req)
 	for {
@@ -1162,7 +1162,7 @@ func ExampleCloudChannelClient_ListPurchasableSkus() {
 
 	req := &channelpb.ListPurchasableSkusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListPurchasableSkusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListPurchasableSkusRequest.
 	}
 	it := c.ListPurchasableSkus(ctx, req)
 	for {
@@ -1193,7 +1193,7 @@ func ExampleCloudChannelClient_ListPurchasableOffers() {
 
 	req := &channelpb.ListPurchasableOffersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListPurchasableOffersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListPurchasableOffersRequest.
 	}
 	it := c.ListPurchasableOffers(ctx, req)
 	for {
@@ -1224,7 +1224,7 @@ func ExampleCloudChannelClient_RegisterSubscriber() {
 
 	req := &channelpb.RegisterSubscriberRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#RegisterSubscriberRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#RegisterSubscriberRequest.
 	}
 	resp, err := c.RegisterSubscriber(ctx, req)
 	if err != nil {
@@ -1249,7 +1249,7 @@ func ExampleCloudChannelClient_UnregisterSubscriber() {
 
 	req := &channelpb.UnregisterSubscriberRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UnregisterSubscriberRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UnregisterSubscriberRequest.
 	}
 	resp, err := c.UnregisterSubscriber(ctx, req)
 	if err != nil {
@@ -1274,7 +1274,7 @@ func ExampleCloudChannelClient_ListSubscribers() {
 
 	req := &channelpb.ListSubscribersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListSubscribersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListSubscribersRequest.
 	}
 	it := c.ListSubscribers(ctx, req)
 	for {
diff --git a/channel/apiv1/cloud_channel_reports_client.go b/channel/apiv1/cloud_channel_reports_client.go
index 9611647e1a0..d35fe6da2e8 100644
--- a/channel/apiv1/cloud_channel_reports_client.go
+++ b/channel/apiv1/cloud_channel_reports_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/channel/apiv1/cloud_channel_reports_client_example_test.go b/channel/apiv1/cloud_channel_reports_client_example_test.go
index cb1df98eca4..653671ae7f3 100644
--- a/channel/apiv1/cloud_channel_reports_client_example_test.go
+++ b/channel/apiv1/cloud_channel_reports_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleCloudChannelReportsClient_RunReportJob() {
 
 	req := &channelpb.RunReportJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#RunReportJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#RunReportJobRequest.
 	}
 	op, err := c.RunReportJob(ctx, req)
 	if err != nil {
@@ -87,7 +87,7 @@ func ExampleCloudChannelReportsClient_FetchReportResults() {
 
 	req := &channelpb.FetchReportResultsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#FetchReportResultsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#FetchReportResultsRequest.
 	}
 	it := c.FetchReportResults(ctx, req)
 	for {
@@ -118,7 +118,7 @@ func ExampleCloudChannelReportsClient_ListReports() {
 
 	req := &channelpb.ListReportsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListReportsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListReportsRequest.
 	}
 	it := c.ListReports(ctx, req)
 	for {
diff --git a/channel/apiv1/doc.go b/channel/apiv1/doc.go
index ccca5c5de3d..078903b08d6 100644
--- a/channel/apiv1/doc.go
+++ b/channel/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &channelpb.RunReportJobRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#RunReportJobRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#RunReportJobRequest.
 //	}
 //	op, err := c.RunReportJob(ctx, req)
 //	if err != nil {
diff --git a/channel/go.mod b/channel/go.mod
index 3bc9e6df936..c6c8e600028 100644
--- a/channel/go.mod
+++ b/channel/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/channel
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/channel/go.sum b/channel/go.sum
index b4fa5e4c13c..197b62f3d3c 100644
--- a/channel/go.sum
+++ b/channel/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c h1:+o+fjzgkPaHAQDdk5gGX4DZF99huQ0BMqgOqx4SwyJw=
-google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/cloudbuild/aliasshim/aliasshim.go b/cloudbuild/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/cloudbuild/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/cloudbuild/apiv1/v2/cloud_build_client.go b/cloudbuild/apiv1/v2/cloud_build_client.go
index 2cc46aad4e1..41c41ed1532 100644
--- a/cloudbuild/apiv1/v2/cloud_build_client.go
+++ b/cloudbuild/apiv1/v2/cloud_build_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/cloudbuild/apiv1/v2/cloud_build_client_example_test.go b/cloudbuild/apiv1/v2/cloud_build_client_example_test.go
index 9b289626472..327c8a08cf4 100644
--- a/cloudbuild/apiv1/v2/cloud_build_client_example_test.go
+++ b/cloudbuild/apiv1/v2/cloud_build_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 	"google.golang.org/api/iterator"
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_CreateBuild() {
 
 	req := &cloudbuildpb.CreateBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CreateBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CreateBuildRequest.
 	}
 	op, err := c.CreateBuild(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleClient_GetBuild() {
 
 	req := &cloudbuildpb.GetBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#GetBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#GetBuildRequest.
 	}
 	resp, err := c.GetBuild(ctx, req)
 	if err != nil {
@@ -111,7 +111,7 @@ func ExampleClient_ListBuilds() {
 
 	req := &cloudbuildpb.ListBuildsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ListBuildsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ListBuildsRequest.
 	}
 	it := c.ListBuilds(ctx, req)
 	for {
@@ -142,7 +142,7 @@ func ExampleClient_CancelBuild() {
 
 	req := &cloudbuildpb.CancelBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CancelBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CancelBuildRequest.
 	}
 	resp, err := c.CancelBuild(ctx, req)
 	if err != nil {
@@ -167,7 +167,7 @@ func ExampleClient_RetryBuild() {
 
 	req := &cloudbuildpb.RetryBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#RetryBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#RetryBuildRequest.
 	}
 	op, err := c.RetryBuild(ctx, req)
 	if err != nil {
@@ -197,7 +197,7 @@ func ExampleClient_ApproveBuild() {
 
 	req := &cloudbuildpb.ApproveBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ApproveBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ApproveBuildRequest.
 	}
 	op, err := c.ApproveBuild(ctx, req)
 	if err != nil {
@@ -227,7 +227,7 @@ func ExampleClient_CreateBuildTrigger() {
 
 	req := &cloudbuildpb.CreateBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CreateBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CreateBuildTriggerRequest.
 	}
 	resp, err := c.CreateBuildTrigger(ctx, req)
 	if err != nil {
@@ -252,7 +252,7 @@ func ExampleClient_GetBuildTrigger() {
 
 	req := &cloudbuildpb.GetBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#GetBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#GetBuildTriggerRequest.
 	}
 	resp, err := c.GetBuildTrigger(ctx, req)
 	if err != nil {
@@ -277,7 +277,7 @@ func ExampleClient_ListBuildTriggers() {
 
 	req := &cloudbuildpb.ListBuildTriggersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ListBuildTriggersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ListBuildTriggersRequest.
 	}
 	it := c.ListBuildTriggers(ctx, req)
 	for {
@@ -308,7 +308,7 @@ func ExampleClient_DeleteBuildTrigger() {
 
 	req := &cloudbuildpb.DeleteBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#DeleteBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#DeleteBuildTriggerRequest.
 	}
 	err = c.DeleteBuildTrigger(ctx, req)
 	if err != nil {
@@ -331,7 +331,7 @@ func ExampleClient_UpdateBuildTrigger() {
 
 	req := &cloudbuildpb.UpdateBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#UpdateBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#UpdateBuildTriggerRequest.
 	}
 	resp, err := c.UpdateBuildTrigger(ctx, req)
 	if err != nil {
@@ -356,7 +356,7 @@ func ExampleClient_RunBuildTrigger() {
 
 	req := &cloudbuildpb.RunBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#RunBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#RunBuildTriggerRequest.
 	}
 	op, err := c.RunBuildTrigger(ctx, req)
 	if err != nil {
@@ -386,7 +386,7 @@ func ExampleClient_ReceiveTriggerWebhook() {
 
 	req := &cloudbuildpb.ReceiveTriggerWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ReceiveTriggerWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ReceiveTriggerWebhookRequest.
 	}
 	resp, err := c.ReceiveTriggerWebhook(ctx, req)
 	if err != nil {
@@ -411,7 +411,7 @@ func ExampleClient_CreateWorkerPool() {
 
 	req := &cloudbuildpb.CreateWorkerPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CreateWorkerPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CreateWorkerPoolRequest.
 	}
 	op, err := c.CreateWorkerPool(ctx, req)
 	if err != nil {
@@ -441,7 +441,7 @@ func ExampleClient_GetWorkerPool() {
 
 	req := &cloudbuildpb.GetWorkerPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#GetWorkerPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#GetWorkerPoolRequest.
 	}
 	resp, err := c.GetWorkerPool(ctx, req)
 	if err != nil {
@@ -466,7 +466,7 @@ func ExampleClient_DeleteWorkerPool() {
 
 	req := &cloudbuildpb.DeleteWorkerPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#DeleteWorkerPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#DeleteWorkerPoolRequest.
 	}
 	op, err := c.DeleteWorkerPool(ctx, req)
 	if err != nil {
@@ -494,7 +494,7 @@ func ExampleClient_UpdateWorkerPool() {
 
 	req := &cloudbuildpb.UpdateWorkerPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#UpdateWorkerPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#UpdateWorkerPoolRequest.
 	}
 	op, err := c.UpdateWorkerPool(ctx, req)
 	if err != nil {
@@ -524,7 +524,7 @@ func ExampleClient_ListWorkerPools() {
 
 	req := &cloudbuildpb.ListWorkerPoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ListWorkerPoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ListWorkerPoolsRequest.
 	}
 	it := c.ListWorkerPools(ctx, req)
 	for {
diff --git a/cloudbuild/apiv1/v2/cloudbuildpb/cloudbuild.pb.go b/cloudbuild/apiv1/v2/cloudbuildpb/cloudbuild.pb.go
index c0f7a507f2a..48cdb2c3dec 100644
--- a/cloudbuild/apiv1/v2/cloudbuildpb/cloudbuild.pb.go
+++ b/cloudbuild/apiv1/v2/cloudbuildpb/cloudbuild.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/cloudbuild/v1/cloudbuild.proto
 
 package cloudbuildpb
@@ -25,18 +25,18 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	httpbody "google.golang.org/genproto/googleapis/api/httpbody"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1699,7 +1699,7 @@ type BuildStep struct {
 	// Time limit for executing this build step. If not defined, the step has no
 	// time limit and will be allowed to continue to run until either it completes
 	// or the build itself times out.
-	Timeout *duration.Duration `protobuf:"bytes,11,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,11,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Output only. Status of the build step. At this time, build step status is
 	// only updated on build completion; step status is not updated in real-time
 	// as the build progresses.
@@ -1819,7 +1819,7 @@ func (x *BuildStep) GetPullTiming() *TimeSpan {
 	return nil
 }
 
-func (x *BuildStep) GetTimeout() *duration.Duration {
+func (x *BuildStep) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -2108,14 +2108,14 @@ type Build struct {
 	// Output only. Results of the build.
 	Results *Results `protobuf:"bytes,10,opt,name=results,proto3" json:"results,omitempty"`
 	// Output only. Time at which the request to create the build was received.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time at which execution of the build was started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. Time at which execution of the build was finished.
 	//
 	// The difference between finish_time and start_time is the duration of the
 	// build's execution.
-	FinishTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
+	FinishTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=finish_time,json=finishTime,proto3" json:"finish_time,omitempty"`
 	// Amount of time that this build should be allowed to run, to second
 	// granularity. If this amount of time elapses, work on the build will cease
 	// and the build status will be `TIMEOUT`.
@@ -2123,7 +2123,7 @@ type Build struct {
 	// `timeout` starts ticking from `startTime`.
 	//
 	// Default time is ten minutes.
-	Timeout *duration.Duration `protobuf:"bytes,12,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,12,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// A list of images to be pushed upon the successful completion of all build
 	// steps.
 	//
@@ -2140,7 +2140,7 @@ type Build struct {
 	// `EXPIRED`.
 	//
 	// The TTL starts ticking from create_time.
-	QueueTtl *duration.Duration `protobuf:"bytes,40,opt,name=queue_ttl,json=queueTtl,proto3" json:"queue_ttl,omitempty"`
+	QueueTtl *durationpb.Duration `protobuf:"bytes,40,opt,name=queue_ttl,json=queueTtl,proto3" json:"queue_ttl,omitempty"`
 	// Artifacts produced by the build that should be uploaded upon
 	// successful completion of all build steps.
 	Artifacts *Artifacts `protobuf:"bytes,37,opt,name=artifacts,proto3" json:"artifacts,omitempty"`
@@ -2283,28 +2283,28 @@ func (x *Build) GetResults() *Results {
 	return nil
 }
 
-func (x *Build) GetCreateTime() *timestamp.Timestamp {
+func (x *Build) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Build) GetStartTime() *timestamp.Timestamp {
+func (x *Build) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Build) GetFinishTime() *timestamp.Timestamp {
+func (x *Build) GetFinishTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.FinishTime
 	}
 	return nil
 }
 
-func (x *Build) GetTimeout() *duration.Duration {
+func (x *Build) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -2318,7 +2318,7 @@ func (x *Build) GetImages() []string {
 	return nil
 }
 
-func (x *Build) GetQueueTtl() *duration.Duration {
+func (x *Build) GetQueueTtl() *durationpb.Duration {
 	if x != nil {
 		return x.QueueTtl
 	}
@@ -2514,9 +2514,9 @@ type TimeSpan struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Start of time span.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End of time span.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *TimeSpan) Reset() {
@@ -2551,14 +2551,14 @@ func (*TimeSpan) Descriptor() ([]byte, []int) {
 	return file_google_devtools_cloudbuild_v1_cloudbuild_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *TimeSpan) GetStartTime() *timestamp.Timestamp {
+func (x *TimeSpan) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *TimeSpan) GetEndTime() *timestamp.Timestamp {
+func (x *TimeSpan) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -3610,7 +3610,7 @@ type ApprovalResult struct {
 	// approve or reject a build at the time that the API was called.
 	ApproverAccount string `protobuf:"bytes,2,opt,name=approver_account,json=approverAccount,proto3" json:"approver_account,omitempty"`
 	// Output only. The time when the approval decision was made.
-	ApprovalTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=approval_time,json=approvalTime,proto3" json:"approval_time,omitempty"`
+	ApprovalTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=approval_time,json=approvalTime,proto3" json:"approval_time,omitempty"`
 	// Required. The decision of this manual approval.
 	Decision ApprovalResult_Decision `protobuf:"varint,4,opt,name=decision,proto3,enum=google.devtools.cloudbuild.v1.ApprovalResult_Decision" json:"decision,omitempty"`
 	// Optional. An optional comment for this manual approval result.
@@ -3661,7 +3661,7 @@ func (x *ApprovalResult) GetApproverAccount() string {
 	return ""
 }
 
-func (x *ApprovalResult) GetApprovalTime() *timestamp.Timestamp {
+func (x *ApprovalResult) GetApprovalTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ApprovalTime
 	}
@@ -3741,7 +3741,7 @@ type BuildTrigger struct {
 	//	*BuildTrigger_Filename
 	BuildTemplate isBuildTrigger_BuildTemplate `protobuf_oneof:"build_template"`
 	// Output only. Time when the trigger was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// If true, the trigger will never automatically execute a build.
 	Disabled bool `protobuf:"varint,9,opt,name=disabled,proto3" json:"disabled,omitempty"`
 	// Substitutions for Build resource. The keys must match the following
@@ -3899,7 +3899,7 @@ func (x *BuildTrigger) GetFilename() string {
 	return ""
 }
 
-func (x *BuildTrigger) GetCreateTime() *timestamp.Timestamp {
+func (x *BuildTrigger) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -5227,13 +5227,13 @@ type WorkerPool struct {
 	Annotations map[string]string `protobuf:"bytes,4,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. Time at which the request to create the `WorkerPool` was
 	// received.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time at which the request to update the `WorkerPool` was
 	// received.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Time at which the request to delete the `WorkerPool` was
 	// received.
-	DeleteTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
+	DeleteTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
 	// Output only. `WorkerPool` state.
 	State WorkerPool_State `protobuf:"varint,8,opt,name=state,proto3,enum=google.devtools.cloudbuild.v1.WorkerPool_State" json:"state,omitempty"`
 	// Private Pool configuration for the `WorkerPool`.
@@ -5308,21 +5308,21 @@ func (x *WorkerPool) GetAnnotations() map[string]string {
 	return nil
 }
 
-func (x *WorkerPool) GetCreateTime() *timestamp.Timestamp {
+func (x *WorkerPool) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *WorkerPool) GetUpdateTime() *timestamp.Timestamp {
+func (x *WorkerPool) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *WorkerPool) GetDeleteTime() *timestamp.Timestamp {
+func (x *WorkerPool) GetDeleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeleteTime
 	}
@@ -5651,7 +5651,7 @@ type UpdateWorkerPoolRequest struct {
 	// Format: `projects/{project}/locations/{location}/workerPools/{workerPool}`.
 	WorkerPool *WorkerPool `protobuf:"bytes,1,opt,name=worker_pool,json=workerPool,proto3" json:"worker_pool,omitempty"`
 	// A mask specifying which fields in `worker_pool` to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// If set, validate the request and preview the response, but do not actually
 	// post it.
 	ValidateOnly bool `protobuf:"varint,4,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
@@ -5696,7 +5696,7 @@ func (x *UpdateWorkerPoolRequest) GetWorkerPool() *WorkerPool {
 	return nil
 }
 
-func (x *UpdateWorkerPoolRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateWorkerPoolRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -5851,9 +5851,9 @@ type CreateWorkerPoolOperationMetadata struct {
 	// `projects/{project}/locations/{location}/workerPools/{worker_pool}`.
 	WorkerPool string `protobuf:"bytes,1,opt,name=worker_pool,json=workerPool,proto3" json:"worker_pool,omitempty"`
 	// Time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time the operation was completed.
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 }
 
 func (x *CreateWorkerPoolOperationMetadata) Reset() {
@@ -5895,14 +5895,14 @@ func (x *CreateWorkerPoolOperationMetadata) GetWorkerPool() string {
 	return ""
 }
 
-func (x *CreateWorkerPoolOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *CreateWorkerPoolOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CreateWorkerPoolOperationMetadata) GetCompleteTime() *timestamp.Timestamp {
+func (x *CreateWorkerPoolOperationMetadata) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -5920,9 +5920,9 @@ type UpdateWorkerPoolOperationMetadata struct {
 	// `projects/{project}/locations/{location}/workerPools/{worker_pool}`.
 	WorkerPool string `protobuf:"bytes,1,opt,name=worker_pool,json=workerPool,proto3" json:"worker_pool,omitempty"`
 	// Time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time the operation was completed.
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 }
 
 func (x *UpdateWorkerPoolOperationMetadata) Reset() {
@@ -5964,14 +5964,14 @@ func (x *UpdateWorkerPoolOperationMetadata) GetWorkerPool() string {
 	return ""
 }
 
-func (x *UpdateWorkerPoolOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *UpdateWorkerPoolOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *UpdateWorkerPoolOperationMetadata) GetCompleteTime() *timestamp.Timestamp {
+func (x *UpdateWorkerPoolOperationMetadata) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -5989,9 +5989,9 @@ type DeleteWorkerPoolOperationMetadata struct {
 	// `projects/{project}/locations/{location}/workerPools/{worker_pool}`.
 	WorkerPool string `protobuf:"bytes,1,opt,name=worker_pool,json=workerPool,proto3" json:"worker_pool,omitempty"`
 	// Time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time the operation was completed.
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 }
 
 func (x *DeleteWorkerPoolOperationMetadata) Reset() {
@@ -6033,14 +6033,14 @@ func (x *DeleteWorkerPoolOperationMetadata) GetWorkerPool() string {
 	return ""
 }
 
-func (x *DeleteWorkerPoolOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *DeleteWorkerPoolOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *DeleteWorkerPoolOperationMetadata) GetCompleteTime() *timestamp.Timestamp {
+func (x *DeleteWorkerPoolOperationMetadata) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -7977,12 +7977,12 @@ var file_google_devtools_cloudbuild_v1_cloudbuild_proto_goTypes = []interface{}{
 	nil,                                      // 84: google.devtools.cloudbuild.v1.WorkerPool.AnnotationsEntry
 	(*PrivatePoolV1Config_WorkerConfig)(nil), // 85: google.devtools.cloudbuild.v1.PrivatePoolV1Config.WorkerConfig
 	(*PrivatePoolV1Config_NetworkConfig)(nil), // 86: google.devtools.cloudbuild.v1.PrivatePoolV1Config.NetworkConfig
-	(*duration.Duration)(nil),                 // 87: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),               // 88: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),               // 87: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),             // 88: google.protobuf.Timestamp
 	(*httpbody.HttpBody)(nil),                 // 89: google.api.HttpBody
-	(*field_mask.FieldMask)(nil),              // 90: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),             // 90: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),             // 91: google.longrunning.Operation
-	(*empty.Empty)(nil),                       // 92: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                     // 92: google.protobuf.Empty
 }
 var file_google_devtools_cloudbuild_v1_cloudbuild_proto_depIdxs = []int32{
 	19,  // 0: google.devtools.cloudbuild.v1.RunBuildTriggerRequest.source:type_name -> google.devtools.cloudbuild.v1.RepoSource
@@ -9027,7 +9027,7 @@ type CloudBuildClient interface {
 	// Deletes a `BuildTrigger` by its project ID and trigger ID.
 	//
 	// This API is experimental.
-	DeleteBuildTrigger(ctx context.Context, in *DeleteBuildTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteBuildTrigger(ctx context.Context, in *DeleteBuildTriggerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates a `BuildTrigger` by its project ID and trigger ID.
 	//
 	// This API is experimental.
@@ -9138,8 +9138,8 @@ func (c *cloudBuildClient) ListBuildTriggers(ctx context.Context, in *ListBuildT
 	return out, nil
 }
 
-func (c *cloudBuildClient) DeleteBuildTrigger(ctx context.Context, in *DeleteBuildTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *cloudBuildClient) DeleteBuildTrigger(ctx context.Context, in *DeleteBuildTriggerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.devtools.cloudbuild.v1.CloudBuild/DeleteBuildTrigger", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -9289,7 +9289,7 @@ type CloudBuildServer interface {
 	// Deletes a `BuildTrigger` by its project ID and trigger ID.
 	//
 	// This API is experimental.
-	DeleteBuildTrigger(context.Context, *DeleteBuildTriggerRequest) (*empty.Empty, error)
+	DeleteBuildTrigger(context.Context, *DeleteBuildTriggerRequest) (*emptypb.Empty, error)
 	// Updates a `BuildTrigger` by its project ID and trigger ID.
 	//
 	// This API is experimental.
@@ -9342,7 +9342,7 @@ func (*UnimplementedCloudBuildServer) GetBuildTrigger(context.Context, *GetBuild
 func (*UnimplementedCloudBuildServer) ListBuildTriggers(context.Context, *ListBuildTriggersRequest) (*ListBuildTriggersResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListBuildTriggers not implemented")
 }
-func (*UnimplementedCloudBuildServer) DeleteBuildTrigger(context.Context, *DeleteBuildTriggerRequest) (*empty.Empty, error) {
+func (*UnimplementedCloudBuildServer) DeleteBuildTrigger(context.Context, *DeleteBuildTriggerRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteBuildTrigger not implemented")
 }
 func (*UnimplementedCloudBuildServer) UpdateBuildTrigger(context.Context, *UpdateBuildTriggerRequest) (*BuildTrigger, error) {
diff --git a/cloudbuild/apiv1/v2/doc.go b/cloudbuild/apiv1/v2/doc.go
index 86467ea0d7a..c728c0996b3 100644
--- a/cloudbuild/apiv1/v2/doc.go
+++ b/cloudbuild/apiv1/v2/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &cloudbuildpb.CreateBuildRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CreateBuildRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CreateBuildRequest.
 //	}
 //	op, err := c.CreateBuild(ctx, req)
 //	if err != nil {
diff --git a/cloudbuild/go.mod b/cloudbuild/go.mod
index b4ea7ad8e59..2fca339201d 100644
--- a/cloudbuild/go.mod
+++ b/cloudbuild/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/cloudbuild
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/cloudbuild/go.sum b/cloudbuild/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/cloudbuild/go.sum
+++ b/cloudbuild/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/clouddms/aliasshim/aliasshim.go b/clouddms/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/clouddms/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/clouddms/apiv1/clouddmspb/clouddms.pb.go b/clouddms/apiv1/clouddmspb/clouddms.pb.go
index ed0f82f0bdb..66484151d64 100644
--- a/clouddms/apiv1/clouddmspb/clouddms.pb.go
+++ b/clouddms/apiv1/clouddmspb/clouddms.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/clouddms/v1/clouddms.proto
 
 package clouddmspb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -354,7 +354,7 @@ type UpdateMigrationJobRequest struct {
 
 	// Required. Field mask is used to specify the fields to be overwritten in the
 	// migration job resource by the update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The migration job parameters to update.
 	MigrationJob *MigrationJob `protobuf:"bytes,2,opt,name=migration_job,json=migrationJob,proto3" json:"migration_job,omitempty"`
 	// A unique id used to identify the request. If the server receives two
@@ -399,7 +399,7 @@ func (*UpdateMigrationJobRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_clouddms_v1_clouddms_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *UpdateMigrationJobRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateMigrationJobRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1374,7 +1374,7 @@ type UpdateConnectionProfileRequest struct {
 
 	// Required. Field mask is used to specify the fields to be overwritten in the
 	// connection profile resource by the update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The connection profile parameters to update.
 	ConnectionProfile *ConnectionProfile `protobuf:"bytes,2,opt,name=connection_profile,json=connectionProfile,proto3" json:"connection_profile,omitempty"`
 	// A unique id used to identify the request. If the server receives two
@@ -1419,7 +1419,7 @@ func (*UpdateConnectionProfileRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_clouddms_v1_clouddms_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *UpdateConnectionProfileRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateConnectionProfileRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1521,9 +1521,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -1571,14 +1571,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_clouddms_v1_clouddms_proto_rawDescGZIP(), []int{22}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2182,9 +2182,9 @@ var file_google_cloud_clouddms_v1_clouddms_proto_goTypes = []interface{}{
 	(*DeleteConnectionProfileRequest)(nil), // 21: google.cloud.clouddms.v1.DeleteConnectionProfileRequest
 	(*OperationMetadata)(nil),              // 22: google.cloud.clouddms.v1.OperationMetadata
 	(*MigrationJob)(nil),                   // 23: google.cloud.clouddms.v1.MigrationJob
-	(*field_mask.FieldMask)(nil),           // 24: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),          // 24: google.protobuf.FieldMask
 	(*ConnectionProfile)(nil),              // 25: google.cloud.clouddms.v1.ConnectionProfile
-	(*timestamp.Timestamp)(nil),            // 26: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 26: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),          // 27: google.longrunning.Operation
 }
 var file_google_cloud_clouddms_v1_clouddms_proto_depIdxs = []int32{
diff --git a/clouddms/apiv1/clouddmspb/clouddms_resources.pb.go b/clouddms/apiv1/clouddmspb/clouddms_resources.pb.go
index 45ce459b529..cbeafc5bfcf 100644
--- a/clouddms/apiv1/clouddmspb/clouddms_resources.pb.go
+++ b/clouddms/apiv1/clouddmspb/clouddms_resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/clouddms/v1/clouddms_resources.proto
 
 package clouddmspb
@@ -24,13 +24,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -1243,14 +1243,14 @@ func (m *SqlAclEntry) GetExpiration() isSqlAclEntry_Expiration {
 	return nil
 }
 
-func (x *SqlAclEntry) GetExpireTime() *timestamp.Timestamp {
+func (x *SqlAclEntry) GetExpireTime() *timestamppb.Timestamp {
 	if x, ok := x.GetExpiration().(*SqlAclEntry_ExpireTime); ok {
 		return x.ExpireTime
 	}
 	return nil
 }
 
-func (x *SqlAclEntry) GetTtl() *duration.Duration {
+func (x *SqlAclEntry) GetTtl() *durationpb.Duration {
 	if x, ok := x.GetExpiration().(*SqlAclEntry_Ttl); ok {
 		return x.Ttl
 	}
@@ -1272,12 +1272,12 @@ type SqlAclEntry_ExpireTime struct {
 	// The time when this access control entry expires in
 	// [RFC 3339](https://tools.ietf.org/html/rfc3339) format, for example:
 	// `2012-11-15T16:19:00.094Z`.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=expire_time,json=expireTime,proto3,oneof"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=expire_time,json=expireTime,proto3,oneof"`
 }
 
 type SqlAclEntry_Ttl struct {
 	// Input only. The time-to-leave of this access control entry.
-	Ttl *duration.Duration `protobuf:"bytes,11,opt,name=ttl,proto3,oneof"`
+	Ttl *durationpb.Duration `protobuf:"bytes,11,opt,name=ttl,proto3,oneof"`
 }
 
 func (*SqlAclEntry_ExpireTime) isSqlAclEntry_Expiration() {}
@@ -1291,14 +1291,14 @@ type SqlIpConfig struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Whether the instance should be assigned an IPv4 address or not.
-	EnableIpv4 *wrappers.BoolValue `protobuf:"bytes,1,opt,name=enable_ipv4,json=enableIpv4,proto3" json:"enable_ipv4,omitempty"`
+	EnableIpv4 *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=enable_ipv4,json=enableIpv4,proto3" json:"enable_ipv4,omitempty"`
 	// The resource link for the VPC network from which the Cloud SQL instance is
 	// accessible for private IP. For example,
 	// `projects/myProject/global/networks/default`. This setting can
 	// be updated, but it cannot be removed after it is set.
 	PrivateNetwork string `protobuf:"bytes,2,opt,name=private_network,json=privateNetwork,proto3" json:"private_network,omitempty"`
 	// Whether SSL connections over IP should be enforced or not.
-	RequireSsl *wrappers.BoolValue `protobuf:"bytes,3,opt,name=require_ssl,json=requireSsl,proto3" json:"require_ssl,omitempty"`
+	RequireSsl *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=require_ssl,json=requireSsl,proto3" json:"require_ssl,omitempty"`
 	// The list of external networks that are allowed to connect to the instance
 	// using the IP. See
 	// https://en.wikipedia.org/wiki/CIDR_notation#CIDR_notation, also known as
@@ -1338,7 +1338,7 @@ func (*SqlIpConfig) Descriptor() ([]byte, []int) {
 	return file_google_cloud_clouddms_v1_clouddms_resources_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *SqlIpConfig) GetEnableIpv4() *wrappers.BoolValue {
+func (x *SqlIpConfig) GetEnableIpv4() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.EnableIpv4
 	}
@@ -1352,7 +1352,7 @@ func (x *SqlIpConfig) GetPrivateNetwork() string {
 	return ""
 }
 
-func (x *SqlIpConfig) GetRequireSsl() *wrappers.BoolValue {
+func (x *SqlIpConfig) GetRequireSsl() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.RequireSsl
 	}
@@ -1389,7 +1389,7 @@ type CloudSqlSettings struct {
 	Tier string `protobuf:"bytes,3,opt,name=tier,proto3" json:"tier,omitempty"`
 	// The maximum size to which storage capacity can be automatically increased.
 	// The default value is 0, which specifies that there is no limit.
-	StorageAutoResizeLimit *wrappers.Int64Value `protobuf:"bytes,4,opt,name=storage_auto_resize_limit,json=storageAutoResizeLimit,proto3" json:"storage_auto_resize_limit,omitempty"`
+	StorageAutoResizeLimit *wrapperspb.Int64Value `protobuf:"bytes,4,opt,name=storage_auto_resize_limit,json=storageAutoResizeLimit,proto3" json:"storage_auto_resize_limit,omitempty"`
 	// The activation policy specifies when the instance is activated; it is
 	// applicable only when the instance state is 'RUNNABLE'. Valid values:
 	//
@@ -1408,7 +1408,7 @@ type CloudSqlSettings struct {
 	// size, Cloud SQL automatically adds additional storage capacity. If the
 	// available storage repeatedly falls below the threshold size, Cloud SQL
 	// continues to add storage until it reaches the maximum of 30 TB.
-	AutoStorageIncrease *wrappers.BoolValue `protobuf:"bytes,7,opt,name=auto_storage_increase,json=autoStorageIncrease,proto3" json:"auto_storage_increase,omitempty"`
+	AutoStorageIncrease *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=auto_storage_increase,json=autoStorageIncrease,proto3" json:"auto_storage_increase,omitempty"`
 	// The database flags passed to the Cloud SQL instance at startup.
 	// An object containing a list of "key": value pairs.
 	// Example: { "name": "wrench", "mass": "1.3kg", "count": "3" }.
@@ -1417,7 +1417,7 @@ type CloudSqlSettings struct {
 	DataDiskType CloudSqlSettings_SqlDataDiskType `protobuf:"varint,9,opt,name=data_disk_type,json=dataDiskType,proto3,enum=google.cloud.clouddms.v1.CloudSqlSettings_SqlDataDiskType" json:"data_disk_type,omitempty"`
 	// The storage capacity available to the database, in GB.
 	// The minimum (and default) size is 10GB.
-	DataDiskSizeGb *wrappers.Int64Value `protobuf:"bytes,10,opt,name=data_disk_size_gb,json=dataDiskSizeGb,proto3" json:"data_disk_size_gb,omitempty"`
+	DataDiskSizeGb *wrapperspb.Int64Value `protobuf:"bytes,10,opt,name=data_disk_size_gb,json=dataDiskSizeGb,proto3" json:"data_disk_size_gb,omitempty"`
 	// The Google Cloud Platform zone where your Cloud SQL datdabse instance is
 	// located.
 	Zone string `protobuf:"bytes,11,opt,name=zone,proto3" json:"zone,omitempty"`
@@ -1486,7 +1486,7 @@ func (x *CloudSqlSettings) GetTier() string {
 	return ""
 }
 
-func (x *CloudSqlSettings) GetStorageAutoResizeLimit() *wrappers.Int64Value {
+func (x *CloudSqlSettings) GetStorageAutoResizeLimit() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.StorageAutoResizeLimit
 	}
@@ -1507,7 +1507,7 @@ func (x *CloudSqlSettings) GetIpConfig() *SqlIpConfig {
 	return nil
 }
 
-func (x *CloudSqlSettings) GetAutoStorageIncrease() *wrappers.BoolValue {
+func (x *CloudSqlSettings) GetAutoStorageIncrease() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.AutoStorageIncrease
 	}
@@ -1528,7 +1528,7 @@ func (x *CloudSqlSettings) GetDataDiskType() CloudSqlSettings_SqlDataDiskType {
 	return CloudSqlSettings_SQL_DATA_DISK_TYPE_UNSPECIFIED
 }
 
-func (x *CloudSqlSettings) GetDataDiskSizeGb() *wrappers.Int64Value {
+func (x *CloudSqlSettings) GetDataDiskSizeGb() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.DataDiskSizeGb
 	}
@@ -1817,11 +1817,11 @@ type MigrationJob struct {
 	// Output only. The timestamp when the migration job resource was created.
 	// A timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds.
 	// Example: "2014-10-02T15:01:23.045123456Z".
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The timestamp when the migration job resource was last updated.
 	// A timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds.
 	// Example: "2014-10-02T15:01:23.045123456Z".
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The resource labels for migration job to use to annotate any related
 	// underlying resources such as Compute Engine VMs. An object containing a
 	// list of "key": "value" pairs.
@@ -1853,7 +1853,7 @@ type MigrationJob struct {
 	Connectivity isMigrationJob_Connectivity `protobuf_oneof:"connectivity"`
 	// Output only. The duration of the migration job (in seconds). A duration in seconds
 	// with up to nine fractional digits, terminated by 's'. Example: "3.5s".
-	Duration *duration.Duration `protobuf:"bytes,12,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,12,opt,name=duration,proto3" json:"duration,omitempty"`
 	// Output only. The error details in case of state FAILED.
 	Error *status.Status `protobuf:"bytes,13,opt,name=error,proto3" json:"error,omitempty"`
 	// The database engine type and provider of the source.
@@ -1861,7 +1861,7 @@ type MigrationJob struct {
 	// The database engine type and provider of the destination.
 	DestinationDatabase *DatabaseType `protobuf:"bytes,15,opt,name=destination_database,json=destinationDatabase,proto3" json:"destination_database,omitempty"`
 	// Output only. If the migration job is completed, the time when it was completed.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,16,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *MigrationJob) Reset() {
@@ -1903,14 +1903,14 @@ func (x *MigrationJob) GetName() string {
 	return ""
 }
 
-func (x *MigrationJob) GetCreateTime() *timestamp.Timestamp {
+func (x *MigrationJob) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *MigrationJob) GetUpdateTime() *timestamp.Timestamp {
+func (x *MigrationJob) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2001,7 +2001,7 @@ func (x *MigrationJob) GetStaticIpConnectivity() *StaticIpConnectivity {
 	return nil
 }
 
-func (x *MigrationJob) GetDuration() *duration.Duration {
+func (x *MigrationJob) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -2029,7 +2029,7 @@ func (x *MigrationJob) GetDestinationDatabase() *DatabaseType {
 	return nil
 }
 
-func (x *MigrationJob) GetEndTime() *timestamp.Timestamp {
+func (x *MigrationJob) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2074,11 +2074,11 @@ type ConnectionProfile struct {
 	// Output only. The timestamp when the resource was created.
 	// A timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds.
 	// Example: "2014-10-02T15:01:23.045123456Z".
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The timestamp when the resource was last updated.
 	// A timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds.
 	// Example: "2014-10-02T15:01:23.045123456Z".
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The resource labels for connection profile to use to annotate any related
 	// underlying resources such as Compute Engine VMs. An object containing a
 	// list of "key": "value" pairs.
@@ -2142,14 +2142,14 @@ func (x *ConnectionProfile) GetName() string {
 	return ""
 }
 
-func (x *ConnectionProfile) GetCreateTime() *timestamp.Timestamp {
+func (x *ConnectionProfile) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ConnectionProfile) GetUpdateTime() *timestamp.Timestamp {
+func (x *ConnectionProfile) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2852,10 +2852,10 @@ var file_google_cloud_clouddms_v1_clouddms_resources_proto_goTypes = []interface
 	nil,                                          // 26: google.cloud.clouddms.v1.CloudSqlSettings.DatabaseFlagsEntry
 	nil,                                          // 27: google.cloud.clouddms.v1.MigrationJob.LabelsEntry
 	nil,                                          // 28: google.cloud.clouddms.v1.ConnectionProfile.LabelsEntry
-	(*timestamp.Timestamp)(nil),                  // 29: google.protobuf.Timestamp
-	(*duration.Duration)(nil),                    // 30: google.protobuf.Duration
-	(*wrappers.BoolValue)(nil),                   // 31: google.protobuf.BoolValue
-	(*wrappers.Int64Value)(nil),                  // 32: google.protobuf.Int64Value
+	(*timestamppb.Timestamp)(nil),                // 29: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                  // 30: google.protobuf.Duration
+	(*wrapperspb.BoolValue)(nil),                 // 31: google.protobuf.BoolValue
+	(*wrapperspb.Int64Value)(nil),                // 32: google.protobuf.Int64Value
 	(*status.Status)(nil),                        // 33: google.rpc.Status
 }
 var file_google_cloud_clouddms_v1_clouddms_resources_proto_depIdxs = []int32{
diff --git a/clouddms/apiv1/data_migration_client.go b/clouddms/apiv1/data_migration_client.go
index 56c8286c54f..19bc68f6606 100644
--- a/clouddms/apiv1/data_migration_client.go
+++ b/clouddms/apiv1/data_migration_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/clouddms/apiv1/data_migration_client_example_test.go b/clouddms/apiv1/data_migration_client_example_test.go
index 83d9be0fc8b..f1215535299 100644
--- a/clouddms/apiv1/data_migration_client_example_test.go
+++ b/clouddms/apiv1/data_migration_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 	"google.golang.org/api/iterator"
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
 )
 
 func ExampleNewDataMigrationClient() {
@@ -56,7 +56,7 @@ func ExampleDataMigrationClient_ListMigrationJobs() {
 
 	req := &clouddmspb.ListMigrationJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#ListMigrationJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#ListMigrationJobsRequest.
 	}
 	it := c.ListMigrationJobs(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleDataMigrationClient_GetMigrationJob() {
 
 	req := &clouddmspb.GetMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#GetMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#GetMigrationJobRequest.
 	}
 	resp, err := c.GetMigrationJob(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleDataMigrationClient_CreateMigrationJob() {
 
 	req := &clouddmspb.CreateMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#CreateMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#CreateMigrationJobRequest.
 	}
 	op, err := c.CreateMigrationJob(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleDataMigrationClient_UpdateMigrationJob() {
 
 	req := &clouddmspb.UpdateMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#UpdateMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#UpdateMigrationJobRequest.
 	}
 	op, err := c.UpdateMigrationJob(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleDataMigrationClient_DeleteMigrationJob() {
 
 	req := &clouddmspb.DeleteMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#DeleteMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#DeleteMigrationJobRequest.
 	}
 	op, err := c.DeleteMigrationJob(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleDataMigrationClient_StartMigrationJob() {
 
 	req := &clouddmspb.StartMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#StartMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#StartMigrationJobRequest.
 	}
 	op, err := c.StartMigrationJob(ctx, req)
 	if err != nil {
@@ -230,7 +230,7 @@ func ExampleDataMigrationClient_StopMigrationJob() {
 
 	req := &clouddmspb.StopMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#StopMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#StopMigrationJobRequest.
 	}
 	op, err := c.StopMigrationJob(ctx, req)
 	if err != nil {
@@ -260,7 +260,7 @@ func ExampleDataMigrationClient_ResumeMigrationJob() {
 
 	req := &clouddmspb.ResumeMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#ResumeMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#ResumeMigrationJobRequest.
 	}
 	op, err := c.ResumeMigrationJob(ctx, req)
 	if err != nil {
@@ -290,7 +290,7 @@ func ExampleDataMigrationClient_PromoteMigrationJob() {
 
 	req := &clouddmspb.PromoteMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#PromoteMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#PromoteMigrationJobRequest.
 	}
 	op, err := c.PromoteMigrationJob(ctx, req)
 	if err != nil {
@@ -320,7 +320,7 @@ func ExampleDataMigrationClient_VerifyMigrationJob() {
 
 	req := &clouddmspb.VerifyMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#VerifyMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#VerifyMigrationJobRequest.
 	}
 	op, err := c.VerifyMigrationJob(ctx, req)
 	if err != nil {
@@ -350,7 +350,7 @@ func ExampleDataMigrationClient_RestartMigrationJob() {
 
 	req := &clouddmspb.RestartMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#RestartMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#RestartMigrationJobRequest.
 	}
 	op, err := c.RestartMigrationJob(ctx, req)
 	if err != nil {
@@ -380,7 +380,7 @@ func ExampleDataMigrationClient_GenerateSshScript() {
 
 	req := &clouddmspb.GenerateSshScriptRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#GenerateSshScriptRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#GenerateSshScriptRequest.
 	}
 	resp, err := c.GenerateSshScript(ctx, req)
 	if err != nil {
@@ -405,7 +405,7 @@ func ExampleDataMigrationClient_ListConnectionProfiles() {
 
 	req := &clouddmspb.ListConnectionProfilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#ListConnectionProfilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#ListConnectionProfilesRequest.
 	}
 	it := c.ListConnectionProfiles(ctx, req)
 	for {
@@ -436,7 +436,7 @@ func ExampleDataMigrationClient_GetConnectionProfile() {
 
 	req := &clouddmspb.GetConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#GetConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#GetConnectionProfileRequest.
 	}
 	resp, err := c.GetConnectionProfile(ctx, req)
 	if err != nil {
@@ -461,7 +461,7 @@ func ExampleDataMigrationClient_CreateConnectionProfile() {
 
 	req := &clouddmspb.CreateConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#CreateConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#CreateConnectionProfileRequest.
 	}
 	op, err := c.CreateConnectionProfile(ctx, req)
 	if err != nil {
@@ -491,7 +491,7 @@ func ExampleDataMigrationClient_UpdateConnectionProfile() {
 
 	req := &clouddmspb.UpdateConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#UpdateConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#UpdateConnectionProfileRequest.
 	}
 	op, err := c.UpdateConnectionProfile(ctx, req)
 	if err != nil {
@@ -521,7 +521,7 @@ func ExampleDataMigrationClient_DeleteConnectionProfile() {
 
 	req := &clouddmspb.DeleteConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#DeleteConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#DeleteConnectionProfileRequest.
 	}
 	op, err := c.DeleteConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/clouddms/apiv1/doc.go b/clouddms/apiv1/doc.go
index 67249133cf9..457ab4f3660 100644
--- a/clouddms/apiv1/doc.go
+++ b/clouddms/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &clouddmspb.ListMigrationJobsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#ListMigrationJobsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#ListMigrationJobsRequest.
 //	}
 //	it := c.ListMigrationJobs(ctx, req)
 //	for {
diff --git a/clouddms/go.mod b/clouddms/go.mod
index 2e7313c472b..16473cd47d9 100644
--- a/clouddms/go.mod
+++ b/clouddms/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/clouddms
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/clouddms/go.sum b/clouddms/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/clouddms/go.sum
+++ b/clouddms/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/cloudtasks/apiv2/cloud_tasks_client.go b/cloudtasks/apiv2/cloud_tasks_client.go
index 01572862337..6b8b6ba5874 100644
--- a/cloudtasks/apiv2/cloud_tasks_client.go
+++ b/cloudtasks/apiv2/cloud_tasks_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -184,22 +184,22 @@ type internalClient interface {
 	Close() error
 	setGoogleClientInfo(...string)
 	Connection() *grpc.ClientConn
-	ListQueues(context.Context, *taskspb.ListQueuesRequest, ...gax.CallOption) *QueueIterator
-	GetQueue(context.Context, *taskspb.GetQueueRequest, ...gax.CallOption) (*taskspb.Queue, error)
-	CreateQueue(context.Context, *taskspb.CreateQueueRequest, ...gax.CallOption) (*taskspb.Queue, error)
-	UpdateQueue(context.Context, *taskspb.UpdateQueueRequest, ...gax.CallOption) (*taskspb.Queue, error)
-	DeleteQueue(context.Context, *taskspb.DeleteQueueRequest, ...gax.CallOption) error
-	PurgeQueue(context.Context, *taskspb.PurgeQueueRequest, ...gax.CallOption) (*taskspb.Queue, error)
-	PauseQueue(context.Context, *taskspb.PauseQueueRequest, ...gax.CallOption) (*taskspb.Queue, error)
-	ResumeQueue(context.Context, *taskspb.ResumeQueueRequest, ...gax.CallOption) (*taskspb.Queue, error)
+	ListQueues(context.Context, *cloudtaskspb.ListQueuesRequest, ...gax.CallOption) *QueueIterator
+	GetQueue(context.Context, *cloudtaskspb.GetQueueRequest, ...gax.CallOption) (*cloudtaskspb.Queue, error)
+	CreateQueue(context.Context, *cloudtaskspb.CreateQueueRequest, ...gax.CallOption) (*cloudtaskspb.Queue, error)
+	UpdateQueue(context.Context, *cloudtaskspb.UpdateQueueRequest, ...gax.CallOption) (*cloudtaskspb.Queue, error)
+	DeleteQueue(context.Context, *cloudtaskspb.DeleteQueueRequest, ...gax.CallOption) error
+	PurgeQueue(context.Context, *cloudtaskspb.PurgeQueueRequest, ...gax.CallOption) (*cloudtaskspb.Queue, error)
+	PauseQueue(context.Context, *cloudtaskspb.PauseQueueRequest, ...gax.CallOption) (*cloudtaskspb.Queue, error)
+	ResumeQueue(context.Context, *cloudtaskspb.ResumeQueueRequest, ...gax.CallOption) (*cloudtaskspb.Queue, error)
 	GetIamPolicy(context.Context, *iampb.GetIamPolicyRequest, ...gax.CallOption) (*iampb.Policy, error)
 	SetIamPolicy(context.Context, *iampb.SetIamPolicyRequest, ...gax.CallOption) (*iampb.Policy, error)
 	TestIamPermissions(context.Context, *iampb.TestIamPermissionsRequest, ...gax.CallOption) (*iampb.TestIamPermissionsResponse, error)
-	ListTasks(context.Context, *taskspb.ListTasksRequest, ...gax.CallOption) *TaskIterator
-	GetTask(context.Context, *taskspb.GetTaskRequest, ...gax.CallOption) (*taskspb.Task, error)
-	CreateTask(context.Context, *taskspb.CreateTaskRequest, ...gax.CallOption) (*taskspb.Task, error)
-	DeleteTask(context.Context, *taskspb.DeleteTaskRequest, ...gax.CallOption) error
-	RunTask(context.Context, *taskspb.RunTaskRequest, ...gax.CallOption) (*taskspb.Task, error)
+	ListTasks(context.Context, *cloudtaskspb.ListTasksRequest, ...gax.CallOption) *TaskIterator
+	GetTask(context.Context, *cloudtaskspb.GetTaskRequest, ...gax.CallOption) (*cloudtaskspb.Task, error)
+	CreateTask(context.Context, *cloudtaskspb.CreateTaskRequest, ...gax.CallOption) (*cloudtaskspb.Task, error)
+	DeleteTask(context.Context, *cloudtaskspb.DeleteTaskRequest, ...gax.CallOption) error
+	RunTask(context.Context, *cloudtaskspb.RunTaskRequest, ...gax.CallOption) (*cloudtaskspb.Task, error)
 }
 
 // Client is a client for interacting with Cloud Tasks API.
@@ -241,12 +241,12 @@ func (c *Client) Connection() *grpc.ClientConn {
 // ListQueues lists queues.
 //
 // Queues are returned in lexicographical order.
-func (c *Client) ListQueues(ctx context.Context, req *taskspb.ListQueuesRequest, opts ...gax.CallOption) *QueueIterator {
+func (c *Client) ListQueues(ctx context.Context, req *cloudtaskspb.ListQueuesRequest, opts ...gax.CallOption) *QueueIterator {
 	return c.internalClient.ListQueues(ctx, req, opts...)
 }
 
 // GetQueue gets a queue.
-func (c *Client) GetQueue(ctx context.Context, req *taskspb.GetQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *Client) GetQueue(ctx context.Context, req *cloudtaskspb.GetQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	return c.internalClient.GetQueue(ctx, req, opts...)
 }
 
@@ -262,7 +262,7 @@ func (c *Client) GetQueue(ctx context.Context, req *taskspb.GetQueueRequest, opt
 // Overview of Queue Management and
 // queue.yaml (at https://cloud.google.com/tasks/docs/queue-yaml) before using
 // this method.
-func (c *Client) CreateQueue(ctx context.Context, req *taskspb.CreateQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *Client) CreateQueue(ctx context.Context, req *cloudtaskspb.CreateQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	return c.internalClient.CreateQueue(ctx, req, opts...)
 }
 
@@ -281,7 +281,7 @@ func (c *Client) CreateQueue(ctx context.Context, req *taskspb.CreateQueueReques
 // Overview of Queue Management and
 // queue.yaml (at https://cloud.google.com/tasks/docs/queue-yaml) before using
 // this method.
-func (c *Client) UpdateQueue(ctx context.Context, req *taskspb.UpdateQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *Client) UpdateQueue(ctx context.Context, req *cloudtaskspb.UpdateQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	return c.internalClient.UpdateQueue(ctx, req, opts...)
 }
 
@@ -298,7 +298,7 @@ func (c *Client) UpdateQueue(ctx context.Context, req *taskspb.UpdateQueueReques
 // Overview of Queue Management and
 // queue.yaml (at https://cloud.google.com/tasks/docs/queue-yaml) before using
 // this method.
-func (c *Client) DeleteQueue(ctx context.Context, req *taskspb.DeleteQueueRequest, opts ...gax.CallOption) error {
+func (c *Client) DeleteQueue(ctx context.Context, req *cloudtaskspb.DeleteQueueRequest, opts ...gax.CallOption) error {
 	return c.internalClient.DeleteQueue(ctx, req, opts...)
 }
 
@@ -308,7 +308,7 @@ func (c *Client) DeleteQueue(ctx context.Context, req *taskspb.DeleteQueueReques
 //
 // Purge operations can take up to one minute to take effect. Tasks
 // might be dispatched before the purge takes effect. A purge is irreversible.
-func (c *Client) PurgeQueue(ctx context.Context, req *taskspb.PurgeQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *Client) PurgeQueue(ctx context.Context, req *cloudtaskspb.PurgeQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	return c.internalClient.PurgeQueue(ctx, req, opts...)
 }
 
@@ -319,7 +319,7 @@ func (c *Client) PurgeQueue(ctx context.Context, req *taskspb.PurgeQueueRequest,
 // ResumeQueue. Tasks can still be added
 // when the queue is paused. A queue is paused if its
 // state is PAUSED.
-func (c *Client) PauseQueue(ctx context.Context, req *taskspb.PauseQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *Client) PauseQueue(ctx context.Context, req *cloudtaskspb.PauseQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	return c.internalClient.PauseQueue(ctx, req, opts...)
 }
 
@@ -336,7 +336,7 @@ func (c *Client) PauseQueue(ctx context.Context, req *taskspb.PauseQueueRequest,
 // queues, follow the 500/50/5 pattern described in
 // Managing Cloud Tasks Scaling
 // Risks (at https://cloud.google.com/tasks/docs/manage-cloud-task-scaling).
-func (c *Client) ResumeQueue(ctx context.Context, req *taskspb.ResumeQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *Client) ResumeQueue(ctx context.Context, req *cloudtaskspb.ResumeQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	return c.internalClient.ResumeQueue(ctx, req, opts...)
 }
 
@@ -388,12 +388,12 @@ func (c *Client) TestIamPermissions(ctx context.Context, req *iampb.TestIamPermi
 //
 // The tasks may be returned in any order. The ordering may change at any
 // time.
-func (c *Client) ListTasks(ctx context.Context, req *taskspb.ListTasksRequest, opts ...gax.CallOption) *TaskIterator {
+func (c *Client) ListTasks(ctx context.Context, req *cloudtaskspb.ListTasksRequest, opts ...gax.CallOption) *TaskIterator {
 	return c.internalClient.ListTasks(ctx, req, opts...)
 }
 
 // GetTask gets a task.
-func (c *Client) GetTask(ctx context.Context, req *taskspb.GetTaskRequest, opts ...gax.CallOption) (*taskspb.Task, error) {
+func (c *Client) GetTask(ctx context.Context, req *cloudtaskspb.GetTaskRequest, opts ...gax.CallOption) (*cloudtaskspb.Task, error) {
 	return c.internalClient.GetTask(ctx, req, opts...)
 }
 
@@ -402,7 +402,7 @@ func (c *Client) GetTask(ctx context.Context, req *taskspb.GetTaskRequest, opts
 // Tasks cannot be updated after creation; there is no UpdateTask command.
 //
 //	The maximum task size is 100KB.
-func (c *Client) CreateTask(ctx context.Context, req *taskspb.CreateTaskRequest, opts ...gax.CallOption) (*taskspb.Task, error) {
+func (c *Client) CreateTask(ctx context.Context, req *cloudtaskspb.CreateTaskRequest, opts ...gax.CallOption) (*cloudtaskspb.Task, error) {
 	return c.internalClient.CreateTask(ctx, req, opts...)
 }
 
@@ -411,7 +411,7 @@ func (c *Client) CreateTask(ctx context.Context, req *taskspb.CreateTaskRequest,
 // A task can be deleted if it is scheduled or dispatched. A task
 // cannot be deleted if it has executed successfully or permanently
 // failed.
-func (c *Client) DeleteTask(ctx context.Context, req *taskspb.DeleteTaskRequest, opts ...gax.CallOption) error {
+func (c *Client) DeleteTask(ctx context.Context, req *cloudtaskspb.DeleteTaskRequest, opts ...gax.CallOption) error {
 	return c.internalClient.DeleteTask(ctx, req, opts...)
 }
 
@@ -439,7 +439,7 @@ func (c *Client) DeleteTask(ctx context.Context, req *taskspb.DeleteTaskRequest,
 // RunTask returns
 // NOT_FOUND when it is called on a
 // task that has already succeeded or permanently failed.
-func (c *Client) RunTask(ctx context.Context, req *taskspb.RunTaskRequest, opts ...gax.CallOption) (*taskspb.Task, error) {
+func (c *Client) RunTask(ctx context.Context, req *cloudtaskspb.RunTaskRequest, opts ...gax.CallOption) (*cloudtaskspb.Task, error) {
 	return c.internalClient.RunTask(ctx, req, opts...)
 }
 
@@ -457,7 +457,7 @@ type gRPCClient struct {
 	CallOptions **CallOptions
 
 	// The gRPC API client.
-	client taskspb.CloudTasksClient
+	client cloudtaskspb.CloudTasksClient
 
 	// The x-goog-* metadata to be sent with each request.
 	xGoogMetadata metadata.MD
@@ -492,7 +492,7 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
 	c := &gRPCClient{
 		connPool:         connPool,
 		disableDeadlines: disableDeadlines,
-		client:           taskspb.NewCloudTasksClient(connPool),
+		client:           cloudtaskspb.NewCloudTasksClient(connPool),
 		CallOptions:      &client.CallOptions,
 	}
 	c.setGoogleClientInfo()
@@ -525,15 +525,15 @@ func (c *gRPCClient) Close() error {
 	return c.connPool.Close()
 }
 
-func (c *gRPCClient) ListQueues(ctx context.Context, req *taskspb.ListQueuesRequest, opts ...gax.CallOption) *QueueIterator {
+func (c *gRPCClient) ListQueues(ctx context.Context, req *cloudtaskspb.ListQueuesRequest, opts ...gax.CallOption) *QueueIterator {
 	md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "parent", url.QueryEscape(req.GetParent())))
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).ListQueues[0:len((*c.CallOptions).ListQueues):len((*c.CallOptions).ListQueues)], opts...)
 	it := &QueueIterator{}
-	req = proto.Clone(req).(*taskspb.ListQueuesRequest)
-	it.InternalFetch = func(pageSize int, pageToken string) ([]*taskspb.Queue, string, error) {
-		resp := &taskspb.ListQueuesResponse{}
+	req = proto.Clone(req).(*cloudtaskspb.ListQueuesRequest)
+	it.InternalFetch = func(pageSize int, pageToken string) ([]*cloudtaskspb.Queue, string, error) {
+		resp := &cloudtaskspb.ListQueuesResponse{}
 		if pageToken != "" {
 			req.PageToken = pageToken
 		}
@@ -570,7 +570,7 @@ func (c *gRPCClient) ListQueues(ctx context.Context, req *taskspb.ListQueuesRequ
 	return it
 }
 
-func (c *gRPCClient) GetQueue(ctx context.Context, req *taskspb.GetQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *gRPCClient) GetQueue(ctx context.Context, req *cloudtaskspb.GetQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -580,7 +580,7 @@ func (c *gRPCClient) GetQueue(ctx context.Context, req *taskspb.GetQueueRequest,
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).GetQueue[0:len((*c.CallOptions).GetQueue):len((*c.CallOptions).GetQueue)], opts...)
-	var resp *taskspb.Queue
+	var resp *cloudtaskspb.Queue
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.GetQueue(ctx, req, settings.GRPC...)
@@ -592,7 +592,7 @@ func (c *gRPCClient) GetQueue(ctx context.Context, req *taskspb.GetQueueRequest,
 	return resp, nil
 }
 
-func (c *gRPCClient) CreateQueue(ctx context.Context, req *taskspb.CreateQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *gRPCClient) CreateQueue(ctx context.Context, req *cloudtaskspb.CreateQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -602,7 +602,7 @@ func (c *gRPCClient) CreateQueue(ctx context.Context, req *taskspb.CreateQueueRe
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).CreateQueue[0:len((*c.CallOptions).CreateQueue):len((*c.CallOptions).CreateQueue)], opts...)
-	var resp *taskspb.Queue
+	var resp *cloudtaskspb.Queue
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.CreateQueue(ctx, req, settings.GRPC...)
@@ -614,7 +614,7 @@ func (c *gRPCClient) CreateQueue(ctx context.Context, req *taskspb.CreateQueueRe
 	return resp, nil
 }
 
-func (c *gRPCClient) UpdateQueue(ctx context.Context, req *taskspb.UpdateQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *gRPCClient) UpdateQueue(ctx context.Context, req *cloudtaskspb.UpdateQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -624,7 +624,7 @@ func (c *gRPCClient) UpdateQueue(ctx context.Context, req *taskspb.UpdateQueueRe
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).UpdateQueue[0:len((*c.CallOptions).UpdateQueue):len((*c.CallOptions).UpdateQueue)], opts...)
-	var resp *taskspb.Queue
+	var resp *cloudtaskspb.Queue
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.UpdateQueue(ctx, req, settings.GRPC...)
@@ -636,7 +636,7 @@ func (c *gRPCClient) UpdateQueue(ctx context.Context, req *taskspb.UpdateQueueRe
 	return resp, nil
 }
 
-func (c *gRPCClient) DeleteQueue(ctx context.Context, req *taskspb.DeleteQueueRequest, opts ...gax.CallOption) error {
+func (c *gRPCClient) DeleteQueue(ctx context.Context, req *cloudtaskspb.DeleteQueueRequest, opts ...gax.CallOption) error {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -654,7 +654,7 @@ func (c *gRPCClient) DeleteQueue(ctx context.Context, req *taskspb.DeleteQueueRe
 	return err
 }
 
-func (c *gRPCClient) PurgeQueue(ctx context.Context, req *taskspb.PurgeQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *gRPCClient) PurgeQueue(ctx context.Context, req *cloudtaskspb.PurgeQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -664,7 +664,7 @@ func (c *gRPCClient) PurgeQueue(ctx context.Context, req *taskspb.PurgeQueueRequ
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).PurgeQueue[0:len((*c.CallOptions).PurgeQueue):len((*c.CallOptions).PurgeQueue)], opts...)
-	var resp *taskspb.Queue
+	var resp *cloudtaskspb.Queue
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.PurgeQueue(ctx, req, settings.GRPC...)
@@ -676,7 +676,7 @@ func (c *gRPCClient) PurgeQueue(ctx context.Context, req *taskspb.PurgeQueueRequ
 	return resp, nil
 }
 
-func (c *gRPCClient) PauseQueue(ctx context.Context, req *taskspb.PauseQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *gRPCClient) PauseQueue(ctx context.Context, req *cloudtaskspb.PauseQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -686,7 +686,7 @@ func (c *gRPCClient) PauseQueue(ctx context.Context, req *taskspb.PauseQueueRequ
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).PauseQueue[0:len((*c.CallOptions).PauseQueue):len((*c.CallOptions).PauseQueue)], opts...)
-	var resp *taskspb.Queue
+	var resp *cloudtaskspb.Queue
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.PauseQueue(ctx, req, settings.GRPC...)
@@ -698,7 +698,7 @@ func (c *gRPCClient) PauseQueue(ctx context.Context, req *taskspb.PauseQueueRequ
 	return resp, nil
 }
 
-func (c *gRPCClient) ResumeQueue(ctx context.Context, req *taskspb.ResumeQueueRequest, opts ...gax.CallOption) (*taskspb.Queue, error) {
+func (c *gRPCClient) ResumeQueue(ctx context.Context, req *cloudtaskspb.ResumeQueueRequest, opts ...gax.CallOption) (*cloudtaskspb.Queue, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -708,7 +708,7 @@ func (c *gRPCClient) ResumeQueue(ctx context.Context, req *taskspb.ResumeQueueRe
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).ResumeQueue[0:len((*c.CallOptions).ResumeQueue):len((*c.CallOptions).ResumeQueue)], opts...)
-	var resp *taskspb.Queue
+	var resp *cloudtaskspb.Queue
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.ResumeQueue(ctx, req, settings.GRPC...)
@@ -786,15 +786,15 @@ func (c *gRPCClient) TestIamPermissions(ctx context.Context, req *iampb.TestIamP
 	return resp, nil
 }
 
-func (c *gRPCClient) ListTasks(ctx context.Context, req *taskspb.ListTasksRequest, opts ...gax.CallOption) *TaskIterator {
+func (c *gRPCClient) ListTasks(ctx context.Context, req *cloudtaskspb.ListTasksRequest, opts ...gax.CallOption) *TaskIterator {
 	md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "parent", url.QueryEscape(req.GetParent())))
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).ListTasks[0:len((*c.CallOptions).ListTasks):len((*c.CallOptions).ListTasks)], opts...)
 	it := &TaskIterator{}
-	req = proto.Clone(req).(*taskspb.ListTasksRequest)
-	it.InternalFetch = func(pageSize int, pageToken string) ([]*taskspb.Task, string, error) {
-		resp := &taskspb.ListTasksResponse{}
+	req = proto.Clone(req).(*cloudtaskspb.ListTasksRequest)
+	it.InternalFetch = func(pageSize int, pageToken string) ([]*cloudtaskspb.Task, string, error) {
+		resp := &cloudtaskspb.ListTasksResponse{}
 		if pageToken != "" {
 			req.PageToken = pageToken
 		}
@@ -831,7 +831,7 @@ func (c *gRPCClient) ListTasks(ctx context.Context, req *taskspb.ListTasksReques
 	return it
 }
 
-func (c *gRPCClient) GetTask(ctx context.Context, req *taskspb.GetTaskRequest, opts ...gax.CallOption) (*taskspb.Task, error) {
+func (c *gRPCClient) GetTask(ctx context.Context, req *cloudtaskspb.GetTaskRequest, opts ...gax.CallOption) (*cloudtaskspb.Task, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -841,7 +841,7 @@ func (c *gRPCClient) GetTask(ctx context.Context, req *taskspb.GetTaskRequest, o
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).GetTask[0:len((*c.CallOptions).GetTask):len((*c.CallOptions).GetTask)], opts...)
-	var resp *taskspb.Task
+	var resp *cloudtaskspb.Task
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.GetTask(ctx, req, settings.GRPC...)
@@ -853,7 +853,7 @@ func (c *gRPCClient) GetTask(ctx context.Context, req *taskspb.GetTaskRequest, o
 	return resp, nil
 }
 
-func (c *gRPCClient) CreateTask(ctx context.Context, req *taskspb.CreateTaskRequest, opts ...gax.CallOption) (*taskspb.Task, error) {
+func (c *gRPCClient) CreateTask(ctx context.Context, req *cloudtaskspb.CreateTaskRequest, opts ...gax.CallOption) (*cloudtaskspb.Task, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -863,7 +863,7 @@ func (c *gRPCClient) CreateTask(ctx context.Context, req *taskspb.CreateTaskRequ
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).CreateTask[0:len((*c.CallOptions).CreateTask):len((*c.CallOptions).CreateTask)], opts...)
-	var resp *taskspb.Task
+	var resp *cloudtaskspb.Task
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.CreateTask(ctx, req, settings.GRPC...)
@@ -875,7 +875,7 @@ func (c *gRPCClient) CreateTask(ctx context.Context, req *taskspb.CreateTaskRequ
 	return resp, nil
 }
 
-func (c *gRPCClient) DeleteTask(ctx context.Context, req *taskspb.DeleteTaskRequest, opts ...gax.CallOption) error {
+func (c *gRPCClient) DeleteTask(ctx context.Context, req *cloudtaskspb.DeleteTaskRequest, opts ...gax.CallOption) error {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -893,7 +893,7 @@ func (c *gRPCClient) DeleteTask(ctx context.Context, req *taskspb.DeleteTaskRequ
 	return err
 }
 
-func (c *gRPCClient) RunTask(ctx context.Context, req *taskspb.RunTaskRequest, opts ...gax.CallOption) (*taskspb.Task, error) {
+func (c *gRPCClient) RunTask(ctx context.Context, req *cloudtaskspb.RunTaskRequest, opts ...gax.CallOption) (*cloudtaskspb.Task, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 10000*time.Millisecond)
 		defer cancel()
@@ -903,7 +903,7 @@ func (c *gRPCClient) RunTask(ctx context.Context, req *taskspb.RunTaskRequest, o
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).RunTask[0:len((*c.CallOptions).RunTask):len((*c.CallOptions).RunTask)], opts...)
-	var resp *taskspb.Task
+	var resp *cloudtaskspb.Task
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.RunTask(ctx, req, settings.GRPC...)
@@ -915,9 +915,9 @@ func (c *gRPCClient) RunTask(ctx context.Context, req *taskspb.RunTaskRequest, o
 	return resp, nil
 }
 
-// QueueIterator manages a stream of *taskspb.Queue.
+// QueueIterator manages a stream of *cloudtaskspb.Queue.
 type QueueIterator struct {
-	items    []*taskspb.Queue
+	items    []*cloudtaskspb.Queue
 	pageInfo *iterator.PageInfo
 	nextFunc func() error
 
@@ -932,7 +932,7 @@ type QueueIterator struct {
 	// InternalFetch returns results from a single call to the underlying RPC.
 	// The number of results is no greater than pageSize.
 	// If there are no more results, nextPageToken is empty and err is nil.
-	InternalFetch func(pageSize int, pageToken string) (results []*taskspb.Queue, nextPageToken string, err error)
+	InternalFetch func(pageSize int, pageToken string) (results []*cloudtaskspb.Queue, nextPageToken string, err error)
 }
 
 // PageInfo supports pagination. See the google.golang.org/api/iterator package for details.
@@ -942,8 +942,8 @@ func (it *QueueIterator) PageInfo() *iterator.PageInfo {
 
 // Next returns the next result. Its second return value is iterator.Done if there are no more
 // results. Once Next returns Done, all subsequent calls will return Done.
-func (it *QueueIterator) Next() (*taskspb.Queue, error) {
-	var item *taskspb.Queue
+func (it *QueueIterator) Next() (*cloudtaskspb.Queue, error) {
+	var item *cloudtaskspb.Queue
 	if err := it.nextFunc(); err != nil {
 		return item, err
 	}
@@ -962,9 +962,9 @@ func (it *QueueIterator) takeBuf() interface{} {
 	return b
 }
 
-// TaskIterator manages a stream of *taskspb.Task.
+// TaskIterator manages a stream of *cloudtaskspb.Task.
 type TaskIterator struct {
-	items    []*taskspb.Task
+	items    []*cloudtaskspb.Task
 	pageInfo *iterator.PageInfo
 	nextFunc func() error
 
@@ -979,7 +979,7 @@ type TaskIterator struct {
 	// InternalFetch returns results from a single call to the underlying RPC.
 	// The number of results is no greater than pageSize.
 	// If there are no more results, nextPageToken is empty and err is nil.
-	InternalFetch func(pageSize int, pageToken string) (results []*taskspb.Task, nextPageToken string, err error)
+	InternalFetch func(pageSize int, pageToken string) (results []*cloudtaskspb.Task, nextPageToken string, err error)
 }
 
 // PageInfo supports pagination. See the google.golang.org/api/iterator package for details.
@@ -989,8 +989,8 @@ func (it *TaskIterator) PageInfo() *iterator.PageInfo {
 
 // Next returns the next result. Its second return value is iterator.Done if there are no more
 // results. Once Next returns Done, all subsequent calls will return Done.
-func (it *TaskIterator) Next() (*taskspb.Task, error) {
-	var item *taskspb.Task
+func (it *TaskIterator) Next() (*cloudtaskspb.Task, error) {
+	var item *cloudtaskspb.Task
 	if err := it.nextFunc(); err != nil {
 		return item, err
 	}
diff --git a/cloudtasks/apiv2/cloud_tasks_client_example_test.go b/cloudtasks/apiv2/cloud_tasks_client_example_test.go
index c9a1a36580c..80ed329e66c 100644
--- a/cloudtasks/apiv2/cloud_tasks_client_example_test.go
+++ b/cloudtasks/apiv2/cloud_tasks_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 	"google.golang.org/api/iterator"
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -55,9 +55,9 @@ func ExampleClient_ListQueues() {
 	}
 	defer c.Close()
 
-	req := &taskspb.ListQueuesRequest{
+	req := &cloudtaskspb.ListQueuesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#ListQueuesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#ListQueuesRequest.
 	}
 	it := c.ListQueues(ctx, req)
 	for {
@@ -86,9 +86,9 @@ func ExampleClient_GetQueue() {
 	}
 	defer c.Close()
 
-	req := &taskspb.GetQueueRequest{
+	req := &cloudtaskspb.GetQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#GetQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#GetQueueRequest.
 	}
 	resp, err := c.GetQueue(ctx, req)
 	if err != nil {
@@ -111,9 +111,9 @@ func ExampleClient_CreateQueue() {
 	}
 	defer c.Close()
 
-	req := &taskspb.CreateQueueRequest{
+	req := &cloudtaskspb.CreateQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#CreateQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#CreateQueueRequest.
 	}
 	resp, err := c.CreateQueue(ctx, req)
 	if err != nil {
@@ -136,9 +136,9 @@ func ExampleClient_UpdateQueue() {
 	}
 	defer c.Close()
 
-	req := &taskspb.UpdateQueueRequest{
+	req := &cloudtaskspb.UpdateQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#UpdateQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#UpdateQueueRequest.
 	}
 	resp, err := c.UpdateQueue(ctx, req)
 	if err != nil {
@@ -161,9 +161,9 @@ func ExampleClient_DeleteQueue() {
 	}
 	defer c.Close()
 
-	req := &taskspb.DeleteQueueRequest{
+	req := &cloudtaskspb.DeleteQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#DeleteQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#DeleteQueueRequest.
 	}
 	err = c.DeleteQueue(ctx, req)
 	if err != nil {
@@ -184,9 +184,9 @@ func ExampleClient_PurgeQueue() {
 	}
 	defer c.Close()
 
-	req := &taskspb.PurgeQueueRequest{
+	req := &cloudtaskspb.PurgeQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#PurgeQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#PurgeQueueRequest.
 	}
 	resp, err := c.PurgeQueue(ctx, req)
 	if err != nil {
@@ -209,9 +209,9 @@ func ExampleClient_PauseQueue() {
 	}
 	defer c.Close()
 
-	req := &taskspb.PauseQueueRequest{
+	req := &cloudtaskspb.PauseQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#PauseQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#PauseQueueRequest.
 	}
 	resp, err := c.PauseQueue(ctx, req)
 	if err != nil {
@@ -234,9 +234,9 @@ func ExampleClient_ResumeQueue() {
 	}
 	defer c.Close()
 
-	req := &taskspb.ResumeQueueRequest{
+	req := &cloudtaskspb.ResumeQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#ResumeQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#ResumeQueueRequest.
 	}
 	resp, err := c.ResumeQueue(ctx, req)
 	if err != nil {
@@ -334,9 +334,9 @@ func ExampleClient_ListTasks() {
 	}
 	defer c.Close()
 
-	req := &taskspb.ListTasksRequest{
+	req := &cloudtaskspb.ListTasksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#ListTasksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#ListTasksRequest.
 	}
 	it := c.ListTasks(ctx, req)
 	for {
@@ -365,9 +365,9 @@ func ExampleClient_GetTask() {
 	}
 	defer c.Close()
 
-	req := &taskspb.GetTaskRequest{
+	req := &cloudtaskspb.GetTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#GetTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#GetTaskRequest.
 	}
 	resp, err := c.GetTask(ctx, req)
 	if err != nil {
@@ -390,9 +390,9 @@ func ExampleClient_CreateTask() {
 	}
 	defer c.Close()
 
-	req := &taskspb.CreateTaskRequest{
+	req := &cloudtaskspb.CreateTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#CreateTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#CreateTaskRequest.
 	}
 	resp, err := c.CreateTask(ctx, req)
 	if err != nil {
@@ -415,9 +415,9 @@ func ExampleClient_DeleteTask() {
 	}
 	defer c.Close()
 
-	req := &taskspb.DeleteTaskRequest{
+	req := &cloudtaskspb.DeleteTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#DeleteTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#DeleteTaskRequest.
 	}
 	err = c.DeleteTask(ctx, req)
 	if err != nil {
@@ -438,9 +438,9 @@ func ExampleClient_RunTask() {
 	}
 	defer c.Close()
 
-	req := &taskspb.RunTaskRequest{
+	req := &cloudtaskspb.RunTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#RunTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#RunTaskRequest.
 	}
 	resp, err := c.RunTask(ctx, req)
 	if err != nil {
diff --git a/cloudtasks/apiv2/cloudtaskspb/cloudtasks.pb.go b/cloudtasks/apiv2/cloudtaskspb/cloudtasks.pb.go
index fdd7da1ab3e..22f1219a1a4 100644
--- a/cloudtasks/apiv2/cloudtaskspb/cloudtasks.pb.go
+++ b/cloudtasks/apiv2/cloudtaskspb/cloudtasks.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/tasks/v2/cloudtasks.proto
 
 package cloudtaskspb
@@ -26,15 +26,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -342,7 +342,7 @@ type UpdateQueueRequest struct {
 	// A mask used to specify which fields of the queue are being updated.
 	//
 	// If empty, then all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateQueueRequest) Reset() {
@@ -384,7 +384,7 @@ func (x *UpdateQueueRequest) GetQueue() *Queue {
 	return nil
 }
 
-func (x *UpdateQueueRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateQueueRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1414,13 +1414,13 @@ var file_google_cloud_tasks_v2_cloudtasks_proto_goTypes = []interface{}{
 	(*DeleteTaskRequest)(nil),             // 13: google.cloud.tasks.v2.DeleteTaskRequest
 	(*RunTaskRequest)(nil),                // 14: google.cloud.tasks.v2.RunTaskRequest
 	(*Queue)(nil),                         // 15: google.cloud.tasks.v2.Queue
-	(*field_mask.FieldMask)(nil),          // 16: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),         // 16: google.protobuf.FieldMask
 	(Task_View)(0),                        // 17: google.cloud.tasks.v2.Task.View
 	(*Task)(nil),                          // 18: google.cloud.tasks.v2.Task
 	(*v1.GetIamPolicyRequest)(nil),        // 19: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 20: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 21: google.iam.v1.TestIamPermissionsRequest
-	(*empty.Empty)(nil),                   // 22: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                 // 22: google.protobuf.Empty
 	(*v1.Policy)(nil),                     // 23: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil), // 24: google.iam.v1.TestIamPermissionsResponse
 }
@@ -1743,7 +1743,7 @@ type CloudTasksClient interface {
 	// [Overview of Queue Management and
 	// queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml) before using
 	// this method.
-	DeleteQueue(ctx context.Context, in *DeleteQueueRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteQueue(ctx context.Context, in *DeleteQueueRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Purges a queue by deleting all of its tasks.
 	//
 	// All tasks created before this method is called are permanently deleted.
@@ -1826,7 +1826,7 @@ type CloudTasksClient interface {
 	// A task can be deleted if it is scheduled or dispatched. A task
 	// cannot be deleted if it has executed successfully or permanently
 	// failed.
-	DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Forces a task to run now.
 	//
 	// When this method is called, Cloud Tasks will dispatch the task, even if
@@ -1898,8 +1898,8 @@ func (c *cloudTasksClient) UpdateQueue(ctx context.Context, in *UpdateQueueReque
 	return out, nil
 }
 
-func (c *cloudTasksClient) DeleteQueue(ctx context.Context, in *DeleteQueueRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *cloudTasksClient) DeleteQueue(ctx context.Context, in *DeleteQueueRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2.CloudTasks/DeleteQueue", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1988,8 +1988,8 @@ func (c *cloudTasksClient) CreateTask(ctx context.Context, in *CreateTaskRequest
 	return out, nil
 }
 
-func (c *cloudTasksClient) DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *cloudTasksClient) DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.tasks.v2.CloudTasks/DeleteTask", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2056,7 +2056,7 @@ type CloudTasksServer interface {
 	// [Overview of Queue Management and
 	// queue.yaml](https://cloud.google.com/tasks/docs/queue-yaml) before using
 	// this method.
-	DeleteQueue(context.Context, *DeleteQueueRequest) (*empty.Empty, error)
+	DeleteQueue(context.Context, *DeleteQueueRequest) (*emptypb.Empty, error)
 	// Purges a queue by deleting all of its tasks.
 	//
 	// All tasks created before this method is called are permanently deleted.
@@ -2139,7 +2139,7 @@ type CloudTasksServer interface {
 	// A task can be deleted if it is scheduled or dispatched. A task
 	// cannot be deleted if it has executed successfully or permanently
 	// failed.
-	DeleteTask(context.Context, *DeleteTaskRequest) (*empty.Empty, error)
+	DeleteTask(context.Context, *DeleteTaskRequest) (*emptypb.Empty, error)
 	// Forces a task to run now.
 	//
 	// When this method is called, Cloud Tasks will dispatch the task, even if
@@ -2183,7 +2183,7 @@ func (*UnimplementedCloudTasksServer) CreateQueue(context.Context, *CreateQueueR
 func (*UnimplementedCloudTasksServer) UpdateQueue(context.Context, *UpdateQueueRequest) (*Queue, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateQueue not implemented")
 }
-func (*UnimplementedCloudTasksServer) DeleteQueue(context.Context, *DeleteQueueRequest) (*empty.Empty, error) {
+func (*UnimplementedCloudTasksServer) DeleteQueue(context.Context, *DeleteQueueRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteQueue not implemented")
 }
 func (*UnimplementedCloudTasksServer) PurgeQueue(context.Context, *PurgeQueueRequest) (*Queue, error) {
@@ -2213,7 +2213,7 @@ func (*UnimplementedCloudTasksServer) GetTask(context.Context, *GetTaskRequest)
 func (*UnimplementedCloudTasksServer) CreateTask(context.Context, *CreateTaskRequest) (*Task, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateTask not implemented")
 }
-func (*UnimplementedCloudTasksServer) DeleteTask(context.Context, *DeleteTaskRequest) (*empty.Empty, error) {
+func (*UnimplementedCloudTasksServer) DeleteTask(context.Context, *DeleteTaskRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTask not implemented")
 }
 func (*UnimplementedCloudTasksServer) RunTask(context.Context, *RunTaskRequest) (*Task, error) {
diff --git a/cloudtasks/apiv2/cloudtaskspb/queue.pb.go b/cloudtasks/apiv2/cloudtaskspb/queue.pb.go
index c066e23d67b..e501c0677d2 100644
--- a/cloudtasks/apiv2/cloudtaskspb/queue.pb.go
+++ b/cloudtasks/apiv2/cloudtaskspb/queue.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/tasks/v2/queue.proto
 
 package cloudtaskspb
@@ -25,11 +25,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -212,7 +212,7 @@ type Queue struct {
 	//
 	// Purge time will be truncated to the nearest microsecond. Purge
 	// time will be unset if the queue has never been purged.
-	PurgeTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=purge_time,json=purgeTime,proto3" json:"purge_time,omitempty"`
+	PurgeTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=purge_time,json=purgeTime,proto3" json:"purge_time,omitempty"`
 	// Configuration options for writing logs to
 	// [Stackdriver Logging](https://cloud.google.com/logging/docs/). If this
 	// field is unset, then no logs are written.
@@ -286,7 +286,7 @@ func (x *Queue) GetState() Queue_State {
 	return Queue_STATE_UNSPECIFIED
 }
 
-func (x *Queue) GetPurgeTime() *timestamp.Timestamp {
+func (x *Queue) GetPurgeTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PurgeTime
 	}
@@ -465,7 +465,7 @@ type RetryConfig struct {
 	// This field has the same meaning as
 	// [task_age_limit in
 	// queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#retry_parameters).
-	MaxRetryDuration *duration.Duration `protobuf:"bytes,2,opt,name=max_retry_duration,json=maxRetryDuration,proto3" json:"max_retry_duration,omitempty"`
+	MaxRetryDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=max_retry_duration,json=maxRetryDuration,proto3" json:"max_retry_duration,omitempty"`
 	// A task will be [scheduled][google.cloud.tasks.v2.Task.schedule_time] for retry between
 	// [min_backoff][google.cloud.tasks.v2.RetryConfig.min_backoff] and
 	// [max_backoff][google.cloud.tasks.v2.RetryConfig.max_backoff] duration after it fails,
@@ -480,7 +480,7 @@ type RetryConfig struct {
 	// This field has the same meaning as
 	// [min_backoff_seconds in
 	// queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#retry_parameters).
-	MinBackoff *duration.Duration `protobuf:"bytes,3,opt,name=min_backoff,json=minBackoff,proto3" json:"min_backoff,omitempty"`
+	MinBackoff *durationpb.Duration `protobuf:"bytes,3,opt,name=min_backoff,json=minBackoff,proto3" json:"min_backoff,omitempty"`
 	// A task will be [scheduled][google.cloud.tasks.v2.Task.schedule_time] for retry between
 	// [min_backoff][google.cloud.tasks.v2.RetryConfig.min_backoff] and
 	// [max_backoff][google.cloud.tasks.v2.RetryConfig.max_backoff] duration after it fails,
@@ -495,7 +495,7 @@ type RetryConfig struct {
 	// This field has the same meaning as
 	// [max_backoff_seconds in
 	// queue.yaml/xml](https://cloud.google.com/appengine/docs/standard/python/config/queueref#retry_parameters).
-	MaxBackoff *duration.Duration `protobuf:"bytes,4,opt,name=max_backoff,json=maxBackoff,proto3" json:"max_backoff,omitempty"`
+	MaxBackoff *durationpb.Duration `protobuf:"bytes,4,opt,name=max_backoff,json=maxBackoff,proto3" json:"max_backoff,omitempty"`
 	// The time between retries will double `max_doublings` times.
 	//
 	// A task's retry interval starts at
@@ -563,21 +563,21 @@ func (x *RetryConfig) GetMaxAttempts() int32 {
 	return 0
 }
 
-func (x *RetryConfig) GetMaxRetryDuration() *duration.Duration {
+func (x *RetryConfig) GetMaxRetryDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MaxRetryDuration
 	}
 	return nil
 }
 
-func (x *RetryConfig) GetMinBackoff() *duration.Duration {
+func (x *RetryConfig) GetMinBackoff() *durationpb.Duration {
 	if x != nil {
 		return x.MinBackoff
 	}
 	return nil
 }
 
-func (x *RetryConfig) GetMaxBackoff() *duration.Duration {
+func (x *RetryConfig) GetMaxBackoff() *durationpb.Duration {
 	if x != nil {
 		return x.MaxBackoff
 	}
@@ -763,8 +763,8 @@ var file_google_cloud_tasks_v2_queue_proto_goTypes = []interface{}{
 	(*RetryConfig)(nil),              // 3: google.cloud.tasks.v2.RetryConfig
 	(*StackdriverLoggingConfig)(nil), // 4: google.cloud.tasks.v2.StackdriverLoggingConfig
 	(*AppEngineRouting)(nil),         // 5: google.cloud.tasks.v2.AppEngineRouting
-	(*timestamp.Timestamp)(nil),      // 6: google.protobuf.Timestamp
-	(*duration.Duration)(nil),        // 7: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),    // 6: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),      // 7: google.protobuf.Duration
 }
 var file_google_cloud_tasks_v2_queue_proto_depIdxs = []int32{
 	5, // 0: google.cloud.tasks.v2.Queue.app_engine_routing_override:type_name -> google.cloud.tasks.v2.AppEngineRouting
diff --git a/cloudtasks/apiv2/cloudtaskspb/target.pb.go b/cloudtasks/apiv2/cloudtaskspb/target.pb.go
index e7788ef8883..d25568c3dd5 100644
--- a/cloudtasks/apiv2/cloudtaskspb/target.pb.go
+++ b/cloudtasks/apiv2/cloudtaskspb/target.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/tasks/v2/target.proto
 
 package cloudtaskspb
diff --git a/cloudtasks/apiv2/cloudtaskspb/task.pb.go b/cloudtasks/apiv2/cloudtaskspb/task.pb.go
index 252d754bbdf..9d54f31e5e0 100644
--- a/cloudtasks/apiv2/cloudtaskspb/task.pb.go
+++ b/cloudtasks/apiv2/cloudtaskspb/task.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/tasks/v2/task.proto
 
 package cloudtaskspb
@@ -25,12 +25,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -147,11 +147,11 @@ type Task struct {
 	// The time when the task is scheduled to be attempted or retried.
 	//
 	// `schedule_time` will be truncated to the nearest microsecond.
-	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	ScheduleTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
 	// Output only. The time that the task was created.
 	//
 	// `create_time` will be truncated to the nearest second.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The deadline for requests sent to the worker. If the worker does not
 	// respond by this deadline then the request is cancelled and the attempt
 	// is marked as a `DEADLINE_EXCEEDED` failure. Cloud Tasks will retry the
@@ -183,7 +183,7 @@ type Task struct {
 	//
 	// `dispatch_deadline` will be truncated to the nearest millisecond. The
 	// deadline is an approximate deadline.
-	DispatchDeadline *duration.Duration `protobuf:"bytes,6,opt,name=dispatch_deadline,json=dispatchDeadline,proto3" json:"dispatch_deadline,omitempty"`
+	DispatchDeadline *durationpb.Duration `protobuf:"bytes,6,opt,name=dispatch_deadline,json=dispatchDeadline,proto3" json:"dispatch_deadline,omitempty"`
 	// Output only. The number of attempts dispatched.
 	//
 	// This count includes attempts which have been dispatched but haven't
@@ -263,21 +263,21 @@ func (x *Task) GetHttpRequest() *HttpRequest {
 	return nil
 }
 
-func (x *Task) GetScheduleTime() *timestamp.Timestamp {
+func (x *Task) GetScheduleTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ScheduleTime
 	}
 	return nil
 }
 
-func (x *Task) GetCreateTime() *timestamp.Timestamp {
+func (x *Task) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Task) GetDispatchDeadline() *duration.Duration {
+func (x *Task) GetDispatchDeadline() *durationpb.Duration {
 	if x != nil {
 		return x.DispatchDeadline
 	}
@@ -350,15 +350,15 @@ type Attempt struct {
 	// Output only. The time that this attempt was scheduled.
 	//
 	// `schedule_time` will be truncated to the nearest microsecond.
-	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	ScheduleTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
 	// Output only. The time that this attempt was dispatched.
 	//
 	// `dispatch_time` will be truncated to the nearest microsecond.
-	DispatchTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=dispatch_time,json=dispatchTime,proto3" json:"dispatch_time,omitempty"`
+	DispatchTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=dispatch_time,json=dispatchTime,proto3" json:"dispatch_time,omitempty"`
 	// Output only. The time that this attempt response was received.
 	//
 	// `response_time` will be truncated to the nearest microsecond.
-	ResponseTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=response_time,json=responseTime,proto3" json:"response_time,omitempty"`
+	ResponseTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=response_time,json=responseTime,proto3" json:"response_time,omitempty"`
 	// Output only. The response from the worker for this attempt.
 	//
 	// If `response_time` is unset, then the task has not been attempted or is
@@ -398,21 +398,21 @@ func (*Attempt) Descriptor() ([]byte, []int) {
 	return file_google_cloud_tasks_v2_task_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *Attempt) GetScheduleTime() *timestamp.Timestamp {
+func (x *Attempt) GetScheduleTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ScheduleTime
 	}
 	return nil
 }
 
-func (x *Attempt) GetDispatchTime() *timestamp.Timestamp {
+func (x *Attempt) GetDispatchTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DispatchTime
 	}
 	return nil
 }
 
-func (x *Attempt) GetResponseTime() *timestamp.Timestamp {
+func (x *Attempt) GetResponseTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ResponseTime
 	}
@@ -536,14 +536,14 @@ func file_google_cloud_tasks_v2_task_proto_rawDescGZIP() []byte {
 var file_google_cloud_tasks_v2_task_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_tasks_v2_task_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_cloud_tasks_v2_task_proto_goTypes = []interface{}{
-	(Task_View)(0),               // 0: google.cloud.tasks.v2.Task.View
-	(*Task)(nil),                 // 1: google.cloud.tasks.v2.Task
-	(*Attempt)(nil),              // 2: google.cloud.tasks.v2.Attempt
-	(*AppEngineHttpRequest)(nil), // 3: google.cloud.tasks.v2.AppEngineHttpRequest
-	(*HttpRequest)(nil),          // 4: google.cloud.tasks.v2.HttpRequest
-	(*timestamp.Timestamp)(nil),  // 5: google.protobuf.Timestamp
-	(*duration.Duration)(nil),    // 6: google.protobuf.Duration
-	(*status.Status)(nil),        // 7: google.rpc.Status
+	(Task_View)(0),                // 0: google.cloud.tasks.v2.Task.View
+	(*Task)(nil),                  // 1: google.cloud.tasks.v2.Task
+	(*Attempt)(nil),               // 2: google.cloud.tasks.v2.Attempt
+	(*AppEngineHttpRequest)(nil),  // 3: google.cloud.tasks.v2.AppEngineHttpRequest
+	(*HttpRequest)(nil),           // 4: google.cloud.tasks.v2.HttpRequest
+	(*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),   // 6: google.protobuf.Duration
+	(*status.Status)(nil),         // 7: google.rpc.Status
 }
 var file_google_cloud_tasks_v2_task_proto_depIdxs = []int32{
 	3,  // 0: google.cloud.tasks.v2.Task.app_engine_http_request:type_name -> google.cloud.tasks.v2.AppEngineHttpRequest
diff --git a/cloudtasks/apiv2/doc.go b/cloudtasks/apiv2/doc.go
index aa9b8ebae20..dfb04f4322e 100644
--- a/cloudtasks/apiv2/doc.go
+++ b/cloudtasks/apiv2/doc.go
@@ -55,9 +55,9 @@
 //	}
 //	defer c.Close()
 //
-//	req := &taskspb.ListQueuesRequest{
+//	req := &cloudtaskspb.ListQueuesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#ListQueuesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#ListQueuesRequest.
 //	}
 //	it := c.ListQueues(ctx, req)
 //	for {
diff --git a/cloudtasks/go.mod b/cloudtasks/go.mod
index 4ca6c8e55e1..69546c68b83 100644
--- a/cloudtasks/go.mod
+++ b/cloudtasks/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/cloudtasks/go.sum b/cloudtasks/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/cloudtasks/go.sum
+++ b/cloudtasks/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/contactcenterinsights/aliasshim/aliasshim.go b/contactcenterinsights/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/contactcenterinsights/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/contactcenterinsights/apiv1/contact_center_insights_client.go b/contactcenterinsights/apiv1/contact_center_insights_client.go
index 30de245b45d..82c5897b05b 100644
--- a/contactcenterinsights/apiv1/contact_center_insights_client.go
+++ b/contactcenterinsights/apiv1/contact_center_insights_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/contactcenterinsights/apiv1/contact_center_insights_client_example_test.go b/contactcenterinsights/apiv1/contact_center_insights_client_example_test.go
index dac72900913..3a5b3f062cc 100644
--- a/contactcenterinsights/apiv1/contact_center_insights_client_example_test.go
+++ b/contactcenterinsights/apiv1/contact_center_insights_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 	"google.golang.org/api/iterator"
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleClient_CreateConversation() {
 
 	req := &contactcenterinsightspb.CreateConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateConversationRequest.
 	}
 	resp, err := c.CreateConversation(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleClient_UpdateConversation() {
 
 	req := &contactcenterinsightspb.UpdateConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateConversationRequest.
 	}
 	resp, err := c.UpdateConversation(ctx, req)
 	if err != nil {
@@ -107,7 +107,7 @@ func ExampleClient_GetConversation() {
 
 	req := &contactcenterinsightspb.GetConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetConversationRequest.
 	}
 	resp, err := c.GetConversation(ctx, req)
 	if err != nil {
@@ -132,7 +132,7 @@ func ExampleClient_ListConversations() {
 
 	req := &contactcenterinsightspb.ListConversationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListConversationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListConversationsRequest.
 	}
 	it := c.ListConversations(ctx, req)
 	for {
@@ -163,7 +163,7 @@ func ExampleClient_DeleteConversation() {
 
 	req := &contactcenterinsightspb.DeleteConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeleteConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeleteConversationRequest.
 	}
 	err = c.DeleteConversation(ctx, req)
 	if err != nil {
@@ -186,7 +186,7 @@ func ExampleClient_CreateAnalysis() {
 
 	req := &contactcenterinsightspb.CreateAnalysisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateAnalysisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateAnalysisRequest.
 	}
 	op, err := c.CreateAnalysis(ctx, req)
 	if err != nil {
@@ -216,7 +216,7 @@ func ExampleClient_GetAnalysis() {
 
 	req := &contactcenterinsightspb.GetAnalysisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetAnalysisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetAnalysisRequest.
 	}
 	resp, err := c.GetAnalysis(ctx, req)
 	if err != nil {
@@ -241,7 +241,7 @@ func ExampleClient_ListAnalyses() {
 
 	req := &contactcenterinsightspb.ListAnalysesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListAnalysesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListAnalysesRequest.
 	}
 	it := c.ListAnalyses(ctx, req)
 	for {
@@ -272,7 +272,7 @@ func ExampleClient_DeleteAnalysis() {
 
 	req := &contactcenterinsightspb.DeleteAnalysisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeleteAnalysisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeleteAnalysisRequest.
 	}
 	err = c.DeleteAnalysis(ctx, req)
 	if err != nil {
@@ -295,7 +295,7 @@ func ExampleClient_ExportInsightsData() {
 
 	req := &contactcenterinsightspb.ExportInsightsDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ExportInsightsDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ExportInsightsDataRequest.
 	}
 	op, err := c.ExportInsightsData(ctx, req)
 	if err != nil {
@@ -325,7 +325,7 @@ func ExampleClient_CreateIssueModel() {
 
 	req := &contactcenterinsightspb.CreateIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateIssueModelRequest.
 	}
 	op, err := c.CreateIssueModel(ctx, req)
 	if err != nil {
@@ -355,7 +355,7 @@ func ExampleClient_UpdateIssueModel() {
 
 	req := &contactcenterinsightspb.UpdateIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateIssueModelRequest.
 	}
 	resp, err := c.UpdateIssueModel(ctx, req)
 	if err != nil {
@@ -380,7 +380,7 @@ func ExampleClient_GetIssueModel() {
 
 	req := &contactcenterinsightspb.GetIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetIssueModelRequest.
 	}
 	resp, err := c.GetIssueModel(ctx, req)
 	if err != nil {
@@ -405,7 +405,7 @@ func ExampleClient_ListIssueModels() {
 
 	req := &contactcenterinsightspb.ListIssueModelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListIssueModelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListIssueModelsRequest.
 	}
 	resp, err := c.ListIssueModels(ctx, req)
 	if err != nil {
@@ -430,7 +430,7 @@ func ExampleClient_DeleteIssueModel() {
 
 	req := &contactcenterinsightspb.DeleteIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeleteIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeleteIssueModelRequest.
 	}
 	op, err := c.DeleteIssueModel(ctx, req)
 	if err != nil {
@@ -458,7 +458,7 @@ func ExampleClient_DeployIssueModel() {
 
 	req := &contactcenterinsightspb.DeployIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeployIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeployIssueModelRequest.
 	}
 	op, err := c.DeployIssueModel(ctx, req)
 	if err != nil {
@@ -488,7 +488,7 @@ func ExampleClient_UndeployIssueModel() {
 
 	req := &contactcenterinsightspb.UndeployIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UndeployIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UndeployIssueModelRequest.
 	}
 	op, err := c.UndeployIssueModel(ctx, req)
 	if err != nil {
@@ -518,7 +518,7 @@ func ExampleClient_GetIssue() {
 
 	req := &contactcenterinsightspb.GetIssueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetIssueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetIssueRequest.
 	}
 	resp, err := c.GetIssue(ctx, req)
 	if err != nil {
@@ -543,7 +543,7 @@ func ExampleClient_ListIssues() {
 
 	req := &contactcenterinsightspb.ListIssuesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListIssuesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListIssuesRequest.
 	}
 	resp, err := c.ListIssues(ctx, req)
 	if err != nil {
@@ -568,7 +568,7 @@ func ExampleClient_UpdateIssue() {
 
 	req := &contactcenterinsightspb.UpdateIssueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateIssueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateIssueRequest.
 	}
 	resp, err := c.UpdateIssue(ctx, req)
 	if err != nil {
@@ -593,7 +593,7 @@ func ExampleClient_CalculateIssueModelStats() {
 
 	req := &contactcenterinsightspb.CalculateIssueModelStatsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CalculateIssueModelStatsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CalculateIssueModelStatsRequest.
 	}
 	resp, err := c.CalculateIssueModelStats(ctx, req)
 	if err != nil {
@@ -618,7 +618,7 @@ func ExampleClient_CreatePhraseMatcher() {
 
 	req := &contactcenterinsightspb.CreatePhraseMatcherRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreatePhraseMatcherRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreatePhraseMatcherRequest.
 	}
 	resp, err := c.CreatePhraseMatcher(ctx, req)
 	if err != nil {
@@ -643,7 +643,7 @@ func ExampleClient_GetPhraseMatcher() {
 
 	req := &contactcenterinsightspb.GetPhraseMatcherRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetPhraseMatcherRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetPhraseMatcherRequest.
 	}
 	resp, err := c.GetPhraseMatcher(ctx, req)
 	if err != nil {
@@ -668,7 +668,7 @@ func ExampleClient_ListPhraseMatchers() {
 
 	req := &contactcenterinsightspb.ListPhraseMatchersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListPhraseMatchersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListPhraseMatchersRequest.
 	}
 	it := c.ListPhraseMatchers(ctx, req)
 	for {
@@ -699,7 +699,7 @@ func ExampleClient_DeletePhraseMatcher() {
 
 	req := &contactcenterinsightspb.DeletePhraseMatcherRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeletePhraseMatcherRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeletePhraseMatcherRequest.
 	}
 	err = c.DeletePhraseMatcher(ctx, req)
 	if err != nil {
@@ -722,7 +722,7 @@ func ExampleClient_UpdatePhraseMatcher() {
 
 	req := &contactcenterinsightspb.UpdatePhraseMatcherRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdatePhraseMatcherRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdatePhraseMatcherRequest.
 	}
 	resp, err := c.UpdatePhraseMatcher(ctx, req)
 	if err != nil {
@@ -747,7 +747,7 @@ func ExampleClient_CalculateStats() {
 
 	req := &contactcenterinsightspb.CalculateStatsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CalculateStatsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CalculateStatsRequest.
 	}
 	resp, err := c.CalculateStats(ctx, req)
 	if err != nil {
@@ -772,7 +772,7 @@ func ExampleClient_GetSettings() {
 
 	req := &contactcenterinsightspb.GetSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetSettingsRequest.
 	}
 	resp, err := c.GetSettings(ctx, req)
 	if err != nil {
@@ -797,7 +797,7 @@ func ExampleClient_UpdateSettings() {
 
 	req := &contactcenterinsightspb.UpdateSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateSettingsRequest.
 	}
 	resp, err := c.UpdateSettings(ctx, req)
 	if err != nil {
@@ -822,7 +822,7 @@ func ExampleClient_CreateView() {
 
 	req := &contactcenterinsightspb.CreateViewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateViewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateViewRequest.
 	}
 	resp, err := c.CreateView(ctx, req)
 	if err != nil {
@@ -847,7 +847,7 @@ func ExampleClient_GetView() {
 
 	req := &contactcenterinsightspb.GetViewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetViewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetViewRequest.
 	}
 	resp, err := c.GetView(ctx, req)
 	if err != nil {
@@ -872,7 +872,7 @@ func ExampleClient_ListViews() {
 
 	req := &contactcenterinsightspb.ListViewsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListViewsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListViewsRequest.
 	}
 	it := c.ListViews(ctx, req)
 	for {
@@ -903,7 +903,7 @@ func ExampleClient_UpdateView() {
 
 	req := &contactcenterinsightspb.UpdateViewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateViewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateViewRequest.
 	}
 	resp, err := c.UpdateView(ctx, req)
 	if err != nil {
@@ -928,7 +928,7 @@ func ExampleClient_DeleteView() {
 
 	req := &contactcenterinsightspb.DeleteViewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeleteViewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeleteViewRequest.
 	}
 	err = c.DeleteView(ctx, req)
 	if err != nil {
diff --git a/contactcenterinsights/apiv1/contactcenterinsightspb/contact_center_insights.pb.go b/contactcenterinsights/apiv1/contactcenterinsightspb/contact_center_insights.pb.go
index 1656f172f82..617821fbf32 100644
--- a/contactcenterinsights/apiv1/contactcenterinsightspb/contact_center_insights.pb.go
+++ b/contactcenterinsights/apiv1/contactcenterinsightspb/contact_center_insights.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/contactcenterinsights/v1/contact_center_insights.proto
 
 package contactcenterinsightspb
@@ -25,18 +25,18 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	status "google.golang.org/genproto/googleapis/rpc/status"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -223,7 +223,7 @@ type CalculateStatsResponse struct {
 
 	// The average duration of all conversations. The average is calculated using
 	// only conversations that have a time duration.
-	AverageDuration *duration.Duration `protobuf:"bytes,1,opt,name=average_duration,json=averageDuration,proto3" json:"average_duration,omitempty"`
+	AverageDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=average_duration,json=averageDuration,proto3" json:"average_duration,omitempty"`
 	// The average number of turns per conversation.
 	AverageTurnCount int32 `protobuf:"varint,2,opt,name=average_turn_count,json=averageTurnCount,proto3" json:"average_turn_count,omitempty"`
 	// The total number of conversations.
@@ -282,7 +282,7 @@ func (*CalculateStatsResponse) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *CalculateStatsResponse) GetAverageDuration() *duration.Duration {
+func (x *CalculateStatsResponse) GetAverageDuration() *durationpb.Duration {
 	if x != nil {
 		return x.AverageDuration
 	}
@@ -346,9 +346,9 @@ type CreateAnalysisOperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The Conversation that this Analysis Operation belongs to.
 	Conversation string `protobuf:"bytes,3,opt,name=conversation,proto3" json:"conversation,omitempty"`
 }
@@ -385,14 +385,14 @@ func (*CreateAnalysisOperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *CreateAnalysisOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *CreateAnalysisOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CreateAnalysisOperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *CreateAnalysisOperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -696,7 +696,7 @@ type UpdateConversationRequest struct {
 	// Required. The new values for the conversation.
 	Conversation *Conversation `protobuf:"bytes,1,opt,name=conversation,proto3" json:"conversation,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateConversationRequest) Reset() {
@@ -738,7 +738,7 @@ func (x *UpdateConversationRequest) GetConversation() *Conversation {
 	return nil
 }
 
-func (x *UpdateConversationRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateConversationRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1219,9 +1219,9 @@ type ExportInsightsDataMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The original request for export.
 	Request *ExportInsightsDataRequest `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
 	// Partial errors during export operation that might cause the operation
@@ -1261,14 +1261,14 @@ func (*ExportInsightsDataMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{15}
 }
 
-func (x *ExportInsightsDataMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *ExportInsightsDataMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ExportInsightsDataMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *ExportInsightsDataMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1393,9 +1393,9 @@ type CreateIssueModelMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The original request for creation.
 	Request *CreateIssueModelRequest `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
 }
@@ -1432,14 +1432,14 @@ func (*CreateIssueModelMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{18}
 }
 
-func (x *CreateIssueModelMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *CreateIssueModelMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CreateIssueModelMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *CreateIssueModelMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1462,7 +1462,7 @@ type UpdateIssueModelRequest struct {
 	// Required. The new values for the issue model.
 	IssueModel *IssueModel `protobuf:"bytes,1,opt,name=issue_model,json=issueModel,proto3" json:"issue_model,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateIssueModelRequest) Reset() {
@@ -1504,7 +1504,7 @@ func (x *UpdateIssueModelRequest) GetIssueModel() *IssueModel {
 	return nil
 }
 
-func (x *UpdateIssueModelRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateIssueModelRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1714,9 +1714,9 @@ type DeleteIssueModelMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The original request for deletion.
 	Request *DeleteIssueModelRequest `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
 }
@@ -1753,14 +1753,14 @@ func (*DeleteIssueModelMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *DeleteIssueModelMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *DeleteIssueModelMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *DeleteIssueModelMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *DeleteIssueModelMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1869,9 +1869,9 @@ type DeployIssueModelMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The original request for deployment.
 	Request *DeployIssueModelRequest `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
 }
@@ -1908,14 +1908,14 @@ func (*DeployIssueModelMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{27}
 }
 
-func (x *DeployIssueModelMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *DeployIssueModelMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *DeployIssueModelMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *DeployIssueModelMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2024,9 +2024,9 @@ type UndeployIssueModelMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The original request for undeployment.
 	Request *UndeployIssueModelRequest `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
 }
@@ -2063,14 +2063,14 @@ func (*UndeployIssueModelMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{30}
 }
 
-func (x *UndeployIssueModelMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *UndeployIssueModelMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *UndeployIssueModelMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *UndeployIssueModelMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2240,7 +2240,7 @@ type UpdateIssueRequest struct {
 	// Required. The new values for the issue.
 	Issue *Issue `protobuf:"bytes,1,opt,name=issue,proto3" json:"issue,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateIssueRequest) Reset() {
@@ -2282,7 +2282,7 @@ func (x *UpdateIssueRequest) GetIssue() *Issue {
 	return nil
 }
 
-func (x *UpdateIssueRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateIssueRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2697,7 +2697,7 @@ type UpdatePhraseMatcherRequest struct {
 	// Required. The new values for the phrase matcher.
 	PhraseMatcher *PhraseMatcher `protobuf:"bytes,1,opt,name=phrase_matcher,json=phraseMatcher,proto3" json:"phrase_matcher,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdatePhraseMatcherRequest) Reset() {
@@ -2739,7 +2739,7 @@ func (x *UpdatePhraseMatcherRequest) GetPhraseMatcher() *PhraseMatcher {
 	return nil
 }
 
-func (x *UpdatePhraseMatcherRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdatePhraseMatcherRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2804,7 +2804,7 @@ type UpdateSettingsRequest struct {
 	// Required. The new settings values.
 	Settings *Settings `protobuf:"bytes,1,opt,name=settings,proto3" json:"settings,omitempty"`
 	// Required. The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSettingsRequest) Reset() {
@@ -2846,7 +2846,7 @@ func (x *UpdateSettingsRequest) GetSettings() *Settings {
 	return nil
 }
 
-func (x *UpdateSettingsRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSettingsRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3103,7 +3103,7 @@ type UpdateViewRequest struct {
 	// Required. The new view.
 	View *View `protobuf:"bytes,1,opt,name=view,proto3" json:"view,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateViewRequest) Reset() {
@@ -3145,7 +3145,7 @@ func (x *UpdateViewRequest) GetView() *View {
 	return nil
 }
 
-func (x *UpdateViewRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateViewRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3208,7 +3208,7 @@ type CalculateStatsResponse_TimeSeries struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The duration of each interval.
-	IntervalDuration *duration.Duration `protobuf:"bytes,1,opt,name=interval_duration,json=intervalDuration,proto3" json:"interval_duration,omitempty"`
+	IntervalDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=interval_duration,json=intervalDuration,proto3" json:"interval_duration,omitempty"`
 	// An ordered list of intervals from earliest to latest, where each interval
 	// represents the number of conversations that transpired during the time
 	// window.
@@ -3247,7 +3247,7 @@ func (*CalculateStatsResponse_TimeSeries) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{1, 0}
 }
 
-func (x *CalculateStatsResponse_TimeSeries) GetIntervalDuration() *duration.Duration {
+func (x *CalculateStatsResponse_TimeSeries) GetIntervalDuration() *durationpb.Duration {
 	if x != nil {
 		return x.IntervalDuration
 	}
@@ -3268,7 +3268,7 @@ type CalculateStatsResponse_TimeSeries_Interval struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The start time of this interval.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The number of conversations created in this interval.
 	ConversationCount int32 `protobuf:"varint,2,opt,name=conversation_count,json=conversationCount,proto3" json:"conversation_count,omitempty"`
 }
@@ -3305,7 +3305,7 @@ func (*CalculateStatsResponse_TimeSeries_Interval) Descriptor() ([]byte, []int)
 	return file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_rawDescGZIP(), []int{1, 0, 0}
 }
 
-func (x *CalculateStatsResponse_TimeSeries_Interval) GetStartTime() *timestamp.Timestamp {
+func (x *CalculateStatsResponse_TimeSeries_Interval) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -4590,10 +4590,10 @@ var file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_goT
 	nil, // 57: google.cloud.contactcenterinsights.v1.CalculateStatsResponse.IssueMatchesStatsEntry
 	(*CalculateStatsResponse_TimeSeries_Interval)(nil),    // 58: google.cloud.contactcenterinsights.v1.CalculateStatsResponse.TimeSeries.Interval
 	(*ExportInsightsDataRequest_BigQueryDestination)(nil), // 59: google.cloud.contactcenterinsights.v1.ExportInsightsDataRequest.BigQueryDestination
-	(*duration.Duration)(nil),                             // 60: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),                           // 61: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                           // 60: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                         // 61: google.protobuf.Timestamp
 	(*Conversation)(nil),                                  // 62: google.cloud.contactcenterinsights.v1.Conversation
-	(*field_mask.FieldMask)(nil),                          // 63: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                         // 63: google.protobuf.FieldMask
 	(*Analysis)(nil),                                      // 64: google.cloud.contactcenterinsights.v1.Analysis
 	(*status.Status)(nil),                                 // 65: google.rpc.Status
 	(*IssueModel)(nil),                                    // 66: google.cloud.contactcenterinsights.v1.IssueModel
@@ -4603,7 +4603,7 @@ var file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_goT
 	(*Settings)(nil),                                      // 70: google.cloud.contactcenterinsights.v1.Settings
 	(*View)(nil),                                          // 71: google.cloud.contactcenterinsights.v1.View
 	(*IssueModelLabelStats_IssueStats)(nil),               // 72: google.cloud.contactcenterinsights.v1.IssueModelLabelStats.IssueStats
-	(*empty.Empty)(nil),                                   // 73: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                 // 73: google.protobuf.Empty
 	(*longrunning.Operation)(nil),                         // 74: google.longrunning.Operation
 }
 var file_google_cloud_contactcenterinsights_v1_contact_center_insights_proto_depIdxs = []int32{
@@ -5439,7 +5439,7 @@ type ContactCenterInsightsClient interface {
 	// Lists conversations.
 	ListConversations(ctx context.Context, in *ListConversationsRequest, opts ...grpc.CallOption) (*ListConversationsResponse, error)
 	// Deletes a conversation.
-	DeleteConversation(ctx context.Context, in *DeleteConversationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteConversation(ctx context.Context, in *DeleteConversationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates an analysis. The long running operation is done when the analysis
 	// has completed.
 	CreateAnalysis(ctx context.Context, in *CreateAnalysisRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
@@ -5448,7 +5448,7 @@ type ContactCenterInsightsClient interface {
 	// Lists analyses.
 	ListAnalyses(ctx context.Context, in *ListAnalysesRequest, opts ...grpc.CallOption) (*ListAnalysesResponse, error)
 	// Deletes an analysis.
-	DeleteAnalysis(ctx context.Context, in *DeleteAnalysisRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAnalysis(ctx context.Context, in *DeleteAnalysisRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Export insights data to a destination defined in the request body.
 	ExportInsightsData(ctx context.Context, in *ExportInsightsDataRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Creates an issue model.
@@ -5482,7 +5482,7 @@ type ContactCenterInsightsClient interface {
 	// Lists phrase matchers.
 	ListPhraseMatchers(ctx context.Context, in *ListPhraseMatchersRequest, opts ...grpc.CallOption) (*ListPhraseMatchersResponse, error)
 	// Deletes a phrase matcher.
-	DeletePhraseMatcher(ctx context.Context, in *DeletePhraseMatcherRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeletePhraseMatcher(ctx context.Context, in *DeletePhraseMatcherRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates a phrase matcher.
 	UpdatePhraseMatcher(ctx context.Context, in *UpdatePhraseMatcherRequest, opts ...grpc.CallOption) (*PhraseMatcher, error)
 	// Gets conversation statistics.
@@ -5500,7 +5500,7 @@ type ContactCenterInsightsClient interface {
 	// Updates a view.
 	UpdateView(ctx context.Context, in *UpdateViewRequest, opts ...grpc.CallOption) (*View, error)
 	// Deletes a view.
-	DeleteView(ctx context.Context, in *DeleteViewRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteView(ctx context.Context, in *DeleteViewRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type contactCenterInsightsClient struct {
@@ -5547,8 +5547,8 @@ func (c *contactCenterInsightsClient) ListConversations(ctx context.Context, in
 	return out, nil
 }
 
-func (c *contactCenterInsightsClient) DeleteConversation(ctx context.Context, in *DeleteConversationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *contactCenterInsightsClient) DeleteConversation(ctx context.Context, in *DeleteConversationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteConversation", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -5583,8 +5583,8 @@ func (c *contactCenterInsightsClient) ListAnalyses(ctx context.Context, in *List
 	return out, nil
 }
 
-func (c *contactCenterInsightsClient) DeleteAnalysis(ctx context.Context, in *DeleteAnalysisRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *contactCenterInsightsClient) DeleteAnalysis(ctx context.Context, in *DeleteAnalysisRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteAnalysis", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -5727,8 +5727,8 @@ func (c *contactCenterInsightsClient) ListPhraseMatchers(ctx context.Context, in
 	return out, nil
 }
 
-func (c *contactCenterInsightsClient) DeletePhraseMatcher(ctx context.Context, in *DeletePhraseMatcherRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *contactCenterInsightsClient) DeletePhraseMatcher(ctx context.Context, in *DeletePhraseMatcherRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeletePhraseMatcher", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -5808,8 +5808,8 @@ func (c *contactCenterInsightsClient) UpdateView(ctx context.Context, in *Update
 	return out, nil
 }
 
-func (c *contactCenterInsightsClient) DeleteView(ctx context.Context, in *DeleteViewRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *contactCenterInsightsClient) DeleteView(ctx context.Context, in *DeleteViewRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.contactcenterinsights.v1.ContactCenterInsights/DeleteView", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -5828,7 +5828,7 @@ type ContactCenterInsightsServer interface {
 	// Lists conversations.
 	ListConversations(context.Context, *ListConversationsRequest) (*ListConversationsResponse, error)
 	// Deletes a conversation.
-	DeleteConversation(context.Context, *DeleteConversationRequest) (*empty.Empty, error)
+	DeleteConversation(context.Context, *DeleteConversationRequest) (*emptypb.Empty, error)
 	// Creates an analysis. The long running operation is done when the analysis
 	// has completed.
 	CreateAnalysis(context.Context, *CreateAnalysisRequest) (*longrunning.Operation, error)
@@ -5837,7 +5837,7 @@ type ContactCenterInsightsServer interface {
 	// Lists analyses.
 	ListAnalyses(context.Context, *ListAnalysesRequest) (*ListAnalysesResponse, error)
 	// Deletes an analysis.
-	DeleteAnalysis(context.Context, *DeleteAnalysisRequest) (*empty.Empty, error)
+	DeleteAnalysis(context.Context, *DeleteAnalysisRequest) (*emptypb.Empty, error)
 	// Export insights data to a destination defined in the request body.
 	ExportInsightsData(context.Context, *ExportInsightsDataRequest) (*longrunning.Operation, error)
 	// Creates an issue model.
@@ -5871,7 +5871,7 @@ type ContactCenterInsightsServer interface {
 	// Lists phrase matchers.
 	ListPhraseMatchers(context.Context, *ListPhraseMatchersRequest) (*ListPhraseMatchersResponse, error)
 	// Deletes a phrase matcher.
-	DeletePhraseMatcher(context.Context, *DeletePhraseMatcherRequest) (*empty.Empty, error)
+	DeletePhraseMatcher(context.Context, *DeletePhraseMatcherRequest) (*emptypb.Empty, error)
 	// Updates a phrase matcher.
 	UpdatePhraseMatcher(context.Context, *UpdatePhraseMatcherRequest) (*PhraseMatcher, error)
 	// Gets conversation statistics.
@@ -5889,7 +5889,7 @@ type ContactCenterInsightsServer interface {
 	// Updates a view.
 	UpdateView(context.Context, *UpdateViewRequest) (*View, error)
 	// Deletes a view.
-	DeleteView(context.Context, *DeleteViewRequest) (*empty.Empty, error)
+	DeleteView(context.Context, *DeleteViewRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedContactCenterInsightsServer can be embedded to have forward compatible implementations.
@@ -5908,7 +5908,7 @@ func (*UnimplementedContactCenterInsightsServer) GetConversation(context.Context
 func (*UnimplementedContactCenterInsightsServer) ListConversations(context.Context, *ListConversationsRequest) (*ListConversationsResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListConversations not implemented")
 }
-func (*UnimplementedContactCenterInsightsServer) DeleteConversation(context.Context, *DeleteConversationRequest) (*empty.Empty, error) {
+func (*UnimplementedContactCenterInsightsServer) DeleteConversation(context.Context, *DeleteConversationRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteConversation not implemented")
 }
 func (*UnimplementedContactCenterInsightsServer) CreateAnalysis(context.Context, *CreateAnalysisRequest) (*longrunning.Operation, error) {
@@ -5920,7 +5920,7 @@ func (*UnimplementedContactCenterInsightsServer) GetAnalysis(context.Context, *G
 func (*UnimplementedContactCenterInsightsServer) ListAnalyses(context.Context, *ListAnalysesRequest) (*ListAnalysesResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListAnalyses not implemented")
 }
-func (*UnimplementedContactCenterInsightsServer) DeleteAnalysis(context.Context, *DeleteAnalysisRequest) (*empty.Empty, error) {
+func (*UnimplementedContactCenterInsightsServer) DeleteAnalysis(context.Context, *DeleteAnalysisRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteAnalysis not implemented")
 }
 func (*UnimplementedContactCenterInsightsServer) ExportInsightsData(context.Context, *ExportInsightsDataRequest) (*longrunning.Operation, error) {
@@ -5968,7 +5968,7 @@ func (*UnimplementedContactCenterInsightsServer) GetPhraseMatcher(context.Contex
 func (*UnimplementedContactCenterInsightsServer) ListPhraseMatchers(context.Context, *ListPhraseMatchersRequest) (*ListPhraseMatchersResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListPhraseMatchers not implemented")
 }
-func (*UnimplementedContactCenterInsightsServer) DeletePhraseMatcher(context.Context, *DeletePhraseMatcherRequest) (*empty.Empty, error) {
+func (*UnimplementedContactCenterInsightsServer) DeletePhraseMatcher(context.Context, *DeletePhraseMatcherRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeletePhraseMatcher not implemented")
 }
 func (*UnimplementedContactCenterInsightsServer) UpdatePhraseMatcher(context.Context, *UpdatePhraseMatcherRequest) (*PhraseMatcher, error) {
@@ -5995,7 +5995,7 @@ func (*UnimplementedContactCenterInsightsServer) ListViews(context.Context, *Lis
 func (*UnimplementedContactCenterInsightsServer) UpdateView(context.Context, *UpdateViewRequest) (*View, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method UpdateView not implemented")
 }
-func (*UnimplementedContactCenterInsightsServer) DeleteView(context.Context, *DeleteViewRequest) (*empty.Empty, error) {
+func (*UnimplementedContactCenterInsightsServer) DeleteView(context.Context, *DeleteViewRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteView not implemented")
 }
 
diff --git a/contactcenterinsights/apiv1/contactcenterinsightspb/resources.pb.go b/contactcenterinsights/apiv1/contactcenterinsightspb/resources.pb.go
index 4a63ed66954..a6c29d30403 100644
--- a/contactcenterinsights/apiv1/contactcenterinsightspb/resources.pb.go
+++ b/contactcenterinsights/apiv1/contactcenterinsightspb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/contactcenterinsights/v1/resources.proto
 
 package contactcenterinsightspb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -595,11 +595,11 @@ type Conversation struct {
 	// The source of the audio and transcription for the conversation.
 	DataSource *ConversationDataSource `protobuf:"bytes,2,opt,name=data_source,json=dataSource,proto3" json:"data_source,omitempty"`
 	// Output only. The time at which the conversation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The most recent time at which the conversation was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The time at which the conversation started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,17,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,17,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// A user-specified language code for the conversation.
 	LanguageCode string `protobuf:"bytes,14,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// An opaque, user-specified string representing the human agent who handled
@@ -613,7 +613,7 @@ type Conversation struct {
 	// Immutable. The conversation medium, if unspecified will default to PHONE_CALL.
 	Medium Conversation_Medium `protobuf:"varint,9,opt,name=medium,proto3,enum=google.cloud.contactcenterinsights.v1.Conversation_Medium" json:"medium,omitempty"`
 	// Output only. The duration of the conversation.
-	Duration *duration.Duration `protobuf:"bytes,10,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,10,opt,name=duration,proto3" json:"duration,omitempty"`
 	// Output only. The number of turns in the conversation.
 	TurnCount int32 `protobuf:"varint,11,opt,name=turn_count,json=turnCount,proto3" json:"turn_count,omitempty"`
 	// Output only. The conversation's latest analysis, if one exists.
@@ -682,14 +682,14 @@ func (m *Conversation) GetExpiration() isConversation_Expiration {
 	return nil
 }
 
-func (x *Conversation) GetExpireTime() *timestamp.Timestamp {
+func (x *Conversation) GetExpireTime() *timestamppb.Timestamp {
 	if x, ok := x.GetExpiration().(*Conversation_ExpireTime); ok {
 		return x.ExpireTime
 	}
 	return nil
 }
 
-func (x *Conversation) GetTtl() *duration.Duration {
+func (x *Conversation) GetTtl() *durationpb.Duration {
 	if x, ok := x.GetExpiration().(*Conversation_Ttl); ok {
 		return x.Ttl
 	}
@@ -710,21 +710,21 @@ func (x *Conversation) GetDataSource() *ConversationDataSource {
 	return nil
 }
 
-func (x *Conversation) GetCreateTime() *timestamp.Timestamp {
+func (x *Conversation) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Conversation) GetUpdateTime() *timestamp.Timestamp {
+func (x *Conversation) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Conversation) GetStartTime() *timestamp.Timestamp {
+func (x *Conversation) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -766,7 +766,7 @@ func (x *Conversation) GetMedium() Conversation_Medium {
 	return Conversation_MEDIUM_UNSPECIFIED
 }
 
-func (x *Conversation) GetDuration() *duration.Duration {
+func (x *Conversation) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -826,13 +826,13 @@ type isConversation_Expiration interface {
 type Conversation_ExpireTime struct {
 	// The time at which this conversation should expire. After this time, the
 	// conversation data and any associated analyses will be deleted.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,15,opt,name=expire_time,json=expireTime,proto3,oneof"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,15,opt,name=expire_time,json=expireTime,proto3,oneof"`
 }
 
 type Conversation_Ttl struct {
 	// Input only. The TTL for this resource. If specified, then this TTL will
 	// be used to calculate the expire time.
-	Ttl *duration.Duration `protobuf:"bytes,16,opt,name=ttl,proto3,oneof"`
+	Ttl *durationpb.Duration `protobuf:"bytes,16,opt,name=ttl,proto3,oneof"`
 }
 
 func (*Conversation_ExpireTime) isConversation_Expiration() {}
@@ -850,10 +850,10 @@ type Analysis struct {
 	// projects/{project}/locations/{location}/conversations/{conversation}/analyses/{analysis}
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time at which the analysis was requested.
-	RequestTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
+	RequestTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=request_time,json=requestTime,proto3" json:"request_time,omitempty"`
 	// Output only. The time at which the analysis was created, which occurs when the
 	// long-running operation completes.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The result of the analysis, which is populated when the analysis
 	// finishes.
 	AnalysisResult *AnalysisResult `protobuf:"bytes,7,opt,name=analysis_result,json=analysisResult,proto3" json:"analysis_result,omitempty"`
@@ -898,14 +898,14 @@ func (x *Analysis) GetName() string {
 	return ""
 }
 
-func (x *Analysis) GetRequestTime() *timestamp.Timestamp {
+func (x *Analysis) GetRequestTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RequestTime
 	}
 	return nil
 }
 
-func (x *Analysis) GetCreateTime() *timestamp.Timestamp {
+func (x *Analysis) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1139,7 +1139,7 @@ type AnalysisResult struct {
 	//	*AnalysisResult_CallAnalysisMetadata_
 	Metadata isAnalysisResult_Metadata `protobuf_oneof:"metadata"`
 	// The time at which the analysis ended.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *AnalysisResult) Reset() {
@@ -1188,7 +1188,7 @@ func (x *AnalysisResult) GetCallAnalysisMetadata() *AnalysisResult_CallAnalysisM
 	return nil
 }
 
-func (x *AnalysisResult) GetEndTime() *timestamp.Timestamp {
+func (x *AnalysisResult) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2238,9 +2238,9 @@ type IssueModel struct {
 	// The representative name for the issue model.
 	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only. The time at which this issue model was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The most recent time at which the issue model was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. State of the model.
 	State IssueModel_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.cloud.contactcenterinsights.v1.IssueModel_State" json:"state,omitempty"`
 	// Configs for the input data that used to create the issue model.
@@ -2295,14 +2295,14 @@ func (x *IssueModel) GetDisplayName() string {
 	return ""
 }
 
-func (x *IssueModel) GetCreateTime() *timestamp.Timestamp {
+func (x *IssueModel) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *IssueModel) GetUpdateTime() *timestamp.Timestamp {
+func (x *IssueModel) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2343,9 +2343,9 @@ type Issue struct {
 	// The representative name for the issue.
 	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only. The time at which this issue was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The most recent time that this issue was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Issue) Reset() {
@@ -2394,14 +2394,14 @@ func (x *Issue) GetDisplayName() string {
 	return ""
 }
 
-func (x *Issue) GetCreateTime() *timestamp.Timestamp {
+func (x *Issue) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Issue) GetUpdateTime() *timestamp.Timestamp {
+func (x *Issue) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2496,7 +2496,7 @@ type PhraseMatcher struct {
 	VersionTag string `protobuf:"bytes,3,opt,name=version_tag,json=versionTag,proto3" json:"version_tag,omitempty"`
 	// Output only. The timestamp of when the revision was created. It is also the create time
 	// when a new matcher is added.
-	RevisionCreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=revision_create_time,json=revisionCreateTime,proto3" json:"revision_create_time,omitempty"`
+	RevisionCreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=revision_create_time,json=revisionCreateTime,proto3" json:"revision_create_time,omitempty"`
 	// The human-readable name of the phrase matcher.
 	DisplayName string `protobuf:"bytes,5,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Required. The type of this phrase matcher.
@@ -2506,13 +2506,13 @@ type PhraseMatcher struct {
 	// A list of phase match rule groups that are included in this matcher.
 	PhraseMatchRuleGroups []*PhraseMatchRuleGroup `protobuf:"bytes,8,rep,name=phrase_match_rule_groups,json=phraseMatchRuleGroups,proto3" json:"phrase_match_rule_groups,omitempty"`
 	// Output only. The most recent time at which the activation status was updated.
-	ActivationUpdateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=activation_update_time,json=activationUpdateTime,proto3" json:"activation_update_time,omitempty"`
+	ActivationUpdateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=activation_update_time,json=activationUpdateTime,proto3" json:"activation_update_time,omitempty"`
 	// The role whose utterances the phrase matcher should be matched
 	// against. If the role is ROLE_UNSPECIFIED it will be matched against any
 	// utterances in the transcript.
 	RoleMatch ConversationParticipant_Role `protobuf:"varint,10,opt,name=role_match,json=roleMatch,proto3,enum=google.cloud.contactcenterinsights.v1.ConversationParticipant_Role" json:"role_match,omitempty"`
 	// Output only. The most recent time at which the phrase matcher was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *PhraseMatcher) Reset() {
@@ -2568,7 +2568,7 @@ func (x *PhraseMatcher) GetVersionTag() string {
 	return ""
 }
 
-func (x *PhraseMatcher) GetRevisionCreateTime() *timestamp.Timestamp {
+func (x *PhraseMatcher) GetRevisionCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RevisionCreateTime
 	}
@@ -2603,7 +2603,7 @@ func (x *PhraseMatcher) GetPhraseMatchRuleGroups() []*PhraseMatchRuleGroup {
 	return nil
 }
 
-func (x *PhraseMatcher) GetActivationUpdateTime() *timestamp.Timestamp {
+func (x *PhraseMatcher) GetActivationUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ActivationUpdateTime
 	}
@@ -2617,7 +2617,7 @@ func (x *PhraseMatcher) GetRoleMatch() ConversationParticipant_Role {
 	return ConversationParticipant_ROLE_UNSPECIFIED
 }
 
-func (x *PhraseMatcher) GetUpdateTime() *timestamp.Timestamp {
+func (x *PhraseMatcher) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2882,9 +2882,9 @@ type Settings struct {
 	// projects/{project}/locations/{location}/settings
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time at which the settings was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which the settings were last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// A language code to be applied to each transcript segment unless the segment
 	// already specifies a language code. Language code defaults to "en-US" if it
 	// is neither specified on the segment nor here.
@@ -2893,7 +2893,7 @@ type Settings struct {
 	// specified expiration, that value will be used instead. Changing this
 	// value will not change the expiration of existing conversations.
 	// Conversations with no expire time persist until they are deleted.
-	ConversationTtl *duration.Duration `protobuf:"bytes,5,opt,name=conversation_ttl,json=conversationTtl,proto3" json:"conversation_ttl,omitempty"`
+	ConversationTtl *durationpb.Duration `protobuf:"bytes,5,opt,name=conversation_ttl,json=conversationTtl,proto3" json:"conversation_ttl,omitempty"`
 	// A map that maps a notification trigger to a Pub/Sub topic. Each time a
 	// specified trigger occurs, Insights will notify the corresponding Pub/Sub
 	// topic.
@@ -2953,14 +2953,14 @@ func (x *Settings) GetName() string {
 	return ""
 }
 
-func (x *Settings) GetCreateTime() *timestamp.Timestamp {
+func (x *Settings) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Settings) GetUpdateTime() *timestamp.Timestamp {
+func (x *Settings) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2974,7 +2974,7 @@ func (x *Settings) GetLanguageCode() string {
 	return ""
 }
 
-func (x *Settings) GetConversationTtl() *duration.Duration {
+func (x *Settings) GetConversationTtl() *durationpb.Duration {
 	if x != nil {
 		return x.ConversationTtl
 	}
@@ -3016,7 +3016,7 @@ type RuntimeAnnotation struct {
 	// projects/{project}/locations/{location}/conversationDatasets/{dataset}/conversationDataItems/{data_item}/conversationAnnotations/{annotation}
 	AnnotationId string `protobuf:"bytes,1,opt,name=annotation_id,json=annotationId,proto3" json:"annotation_id,omitempty"`
 	// The time at which this annotation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The boundary in the conversation where the annotation starts, inclusive.
 	StartBoundary *AnnotationBoundary `protobuf:"bytes,3,opt,name=start_boundary,json=startBoundary,proto3" json:"start_boundary,omitempty"`
 	// The boundary in the conversation where the annotation ends, inclusive.
@@ -3106,7 +3106,7 @@ func (x *RuntimeAnnotation) GetAnnotationId() string {
 	return ""
 }
 
-func (x *RuntimeAnnotation) GetCreateTime() *timestamp.Timestamp {
+func (x *RuntimeAnnotation) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -3796,9 +3796,9 @@ type View struct {
 	// The human-readable display name of the view.
 	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only. The time at which this view was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The most recent time at which the view was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// String with specific view properties.
 	Value string `protobuf:"bytes,5,opt,name=value,proto3" json:"value,omitempty"`
 }
@@ -3849,14 +3849,14 @@ func (x *View) GetDisplayName() string {
 	return ""
 }
 
-func (x *View) GetCreateTime() *timestamp.Timestamp {
+func (x *View) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *View) GetUpdateTime() *timestamp.Timestamp {
+func (x *View) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -3984,7 +3984,7 @@ type Conversation_Transcript_TranscriptSegment struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time that the message occurred, if provided.
-	MessageTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=message_time,json=messageTime,proto3" json:"message_time,omitempty"`
+	MessageTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=message_time,json=messageTime,proto3" json:"message_time,omitempty"`
 	// The text of this segment.
 	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text,omitempty"`
 	// A confidence estimate between 0.0 and 1.0 of the fidelity of this
@@ -4041,7 +4041,7 @@ func (*Conversation_Transcript_TranscriptSegment) Descriptor() ([]byte, []int) {
 	return file_google_cloud_contactcenterinsights_v1_resources_proto_rawDescGZIP(), []int{0, 1, 0}
 }
 
-func (x *Conversation_Transcript_TranscriptSegment) GetMessageTime() *timestamp.Timestamp {
+func (x *Conversation_Transcript_TranscriptSegment) GetMessageTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.MessageTime
 	}
@@ -4112,10 +4112,10 @@ type Conversation_Transcript_TranscriptSegment_WordInfo struct {
 
 	// Time offset of the start of this word relative to the beginning of
 	// the total conversation.
-	StartOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_offset,json=startOffset,proto3" json:"start_offset,omitempty"`
+	StartOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=start_offset,json=startOffset,proto3" json:"start_offset,omitempty"`
 	// Time offset of the end of this word relative to the beginning of the
 	// total conversation.
-	EndOffset *duration.Duration `protobuf:"bytes,2,opt,name=end_offset,json=endOffset,proto3" json:"end_offset,omitempty"`
+	EndOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=end_offset,json=endOffset,proto3" json:"end_offset,omitempty"`
 	// The word itself. Includes punctuation marks that surround the word.
 	Word string `protobuf:"bytes,3,opt,name=word,proto3" json:"word,omitempty"`
 	// A confidence estimate between 0.0 and 1.0 of the fidelity of this
@@ -4155,14 +4155,14 @@ func (*Conversation_Transcript_TranscriptSegment_WordInfo) Descriptor() ([]byte,
 	return file_google_cloud_contactcenterinsights_v1_resources_proto_rawDescGZIP(), []int{0, 1, 0, 0}
 }
 
-func (x *Conversation_Transcript_TranscriptSegment_WordInfo) GetStartOffset() *duration.Duration {
+func (x *Conversation_Transcript_TranscriptSegment_WordInfo) GetStartOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartOffset
 	}
 	return nil
 }
 
-func (x *Conversation_Transcript_TranscriptSegment_WordInfo) GetEndOffset() *duration.Duration {
+func (x *Conversation_Transcript_TranscriptSegment_WordInfo) GetEndOffset() *durationpb.Duration {
 	if x != nil {
 		return x.EndOffset
 	}
@@ -5626,8 +5626,8 @@ var file_google_cloud_contactcenterinsights_v1_resources_proto_goTypes = []inter
 	nil,                                     // 65: google.cloud.contactcenterinsights.v1.FaqAnswerData.MetadataEntry
 	nil,                                     // 66: google.cloud.contactcenterinsights.v1.SmartReplyData.MetadataEntry
 	nil,                                     // 67: google.cloud.contactcenterinsights.v1.SmartComposeSuggestionData.MetadataEntry
-	(*timestamp.Timestamp)(nil),             // 68: google.protobuf.Timestamp
-	(*duration.Duration)(nil),               // 69: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),           // 68: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),             // 69: google.protobuf.Duration
 }
 var file_google_cloud_contactcenterinsights_v1_resources_proto_depIdxs = []int32{
 	47, // 0: google.cloud.contactcenterinsights.v1.Conversation.call_metadata:type_name -> google.cloud.contactcenterinsights.v1.Conversation.CallMetadata
diff --git a/contactcenterinsights/apiv1/doc.go b/contactcenterinsights/apiv1/doc.go
index 2efd0a47223..e62ab6dbef9 100644
--- a/contactcenterinsights/apiv1/doc.go
+++ b/contactcenterinsights/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &contactcenterinsightspb.CreateConversationRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateConversationRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateConversationRequest.
 //	}
 //	resp, err := c.CreateConversation(ctx, req)
 //	if err != nil {
diff --git a/contactcenterinsights/go.mod b/contactcenterinsights/go.mod
index a8b2043cdab..bac4f3b6332 100644
--- a/contactcenterinsights/go.mod
+++ b/contactcenterinsights/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/contactcenterinsights
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/contactcenterinsights/go.sum b/contactcenterinsights/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/contactcenterinsights/go.sum
+++ b/contactcenterinsights/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/container/aliasshim/aliasshim.go b/container/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/container/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/container/apiv1/cluster_manager_client.go b/container/apiv1/cluster_manager_client.go
index 86b6ab7a6cd..c7a5a7773cd 100644
--- a/container/apiv1/cluster_manager_client.go
+++ b/container/apiv1/cluster_manager_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/container/apiv1/cluster_manager_client_example_test.go b/container/apiv1/cluster_manager_client_example_test.go
index a24ee68e3eb..b8c98f78d8c 100644
--- a/container/apiv1/cluster_manager_client_example_test.go
+++ b/container/apiv1/cluster_manager_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 	"google.golang.org/api/iterator"
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
 )
 
 func ExampleNewClusterManagerClient() {
@@ -56,7 +56,7 @@ func ExampleClusterManagerClient_ListClusters() {
 
 	req := &containerpb.ListClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListClustersRequest.
 	}
 	resp, err := c.ListClusters(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClusterManagerClient_GetCluster() {
 
 	req := &containerpb.GetClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetClusterRequest.
 	}
 	resp, err := c.GetCluster(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleClusterManagerClient_CreateCluster() {
 
 	req := &containerpb.CreateClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CreateClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CreateClusterRequest.
 	}
 	resp, err := c.CreateCluster(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleClusterManagerClient_UpdateCluster() {
 
 	req := &containerpb.UpdateClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#UpdateClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#UpdateClusterRequest.
 	}
 	resp, err := c.UpdateCluster(ctx, req)
 	if err != nil {
@@ -156,7 +156,7 @@ func ExampleClusterManagerClient_UpdateNodePool() {
 
 	req := &containerpb.UpdateNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#UpdateNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#UpdateNodePoolRequest.
 	}
 	resp, err := c.UpdateNodePool(ctx, req)
 	if err != nil {
@@ -181,7 +181,7 @@ func ExampleClusterManagerClient_SetNodePoolAutoscaling() {
 
 	req := &containerpb.SetNodePoolAutoscalingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetNodePoolAutoscalingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetNodePoolAutoscalingRequest.
 	}
 	resp, err := c.SetNodePoolAutoscaling(ctx, req)
 	if err != nil {
@@ -206,7 +206,7 @@ func ExampleClusterManagerClient_SetLoggingService() {
 
 	req := &containerpb.SetLoggingServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetLoggingServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetLoggingServiceRequest.
 	}
 	resp, err := c.SetLoggingService(ctx, req)
 	if err != nil {
@@ -231,7 +231,7 @@ func ExampleClusterManagerClient_SetMonitoringService() {
 
 	req := &containerpb.SetMonitoringServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetMonitoringServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetMonitoringServiceRequest.
 	}
 	resp, err := c.SetMonitoringService(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleClusterManagerClient_SetAddonsConfig() {
 
 	req := &containerpb.SetAddonsConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetAddonsConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetAddonsConfigRequest.
 	}
 	resp, err := c.SetAddonsConfig(ctx, req)
 	if err != nil {
@@ -281,7 +281,7 @@ func ExampleClusterManagerClient_SetLocations() {
 
 	req := &containerpb.SetLocationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetLocationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetLocationsRequest.
 	}
 	resp, err := c.SetLocations(ctx, req)
 	if err != nil {
@@ -306,7 +306,7 @@ func ExampleClusterManagerClient_UpdateMaster() {
 
 	req := &containerpb.UpdateMasterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#UpdateMasterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#UpdateMasterRequest.
 	}
 	resp, err := c.UpdateMaster(ctx, req)
 	if err != nil {
@@ -331,7 +331,7 @@ func ExampleClusterManagerClient_SetMasterAuth() {
 
 	req := &containerpb.SetMasterAuthRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetMasterAuthRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetMasterAuthRequest.
 	}
 	resp, err := c.SetMasterAuth(ctx, req)
 	if err != nil {
@@ -356,7 +356,7 @@ func ExampleClusterManagerClient_DeleteCluster() {
 
 	req := &containerpb.DeleteClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#DeleteClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#DeleteClusterRequest.
 	}
 	resp, err := c.DeleteCluster(ctx, req)
 	if err != nil {
@@ -381,7 +381,7 @@ func ExampleClusterManagerClient_ListOperations() {
 
 	req := &containerpb.ListOperationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListOperationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListOperationsRequest.
 	}
 	resp, err := c.ListOperations(ctx, req)
 	if err != nil {
@@ -406,7 +406,7 @@ func ExampleClusterManagerClient_GetOperation() {
 
 	req := &containerpb.GetOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetOperationRequest.
 	}
 	resp, err := c.GetOperation(ctx, req)
 	if err != nil {
@@ -431,7 +431,7 @@ func ExampleClusterManagerClient_CancelOperation() {
 
 	req := &containerpb.CancelOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CancelOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CancelOperationRequest.
 	}
 	err = c.CancelOperation(ctx, req)
 	if err != nil {
@@ -454,7 +454,7 @@ func ExampleClusterManagerClient_GetServerConfig() {
 
 	req := &containerpb.GetServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetServerConfigRequest.
 	}
 	resp, err := c.GetServerConfig(ctx, req)
 	if err != nil {
@@ -479,7 +479,7 @@ func ExampleClusterManagerClient_GetJSONWebKeys() {
 
 	req := &containerpb.GetJSONWebKeysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetJSONWebKeysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetJSONWebKeysRequest.
 	}
 	resp, err := c.GetJSONWebKeys(ctx, req)
 	if err != nil {
@@ -504,7 +504,7 @@ func ExampleClusterManagerClient_ListNodePools() {
 
 	req := &containerpb.ListNodePoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListNodePoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListNodePoolsRequest.
 	}
 	resp, err := c.ListNodePools(ctx, req)
 	if err != nil {
@@ -529,7 +529,7 @@ func ExampleClusterManagerClient_GetNodePool() {
 
 	req := &containerpb.GetNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetNodePoolRequest.
 	}
 	resp, err := c.GetNodePool(ctx, req)
 	if err != nil {
@@ -554,7 +554,7 @@ func ExampleClusterManagerClient_CreateNodePool() {
 
 	req := &containerpb.CreateNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CreateNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CreateNodePoolRequest.
 	}
 	resp, err := c.CreateNodePool(ctx, req)
 	if err != nil {
@@ -579,7 +579,7 @@ func ExampleClusterManagerClient_DeleteNodePool() {
 
 	req := &containerpb.DeleteNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#DeleteNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#DeleteNodePoolRequest.
 	}
 	resp, err := c.DeleteNodePool(ctx, req)
 	if err != nil {
@@ -604,7 +604,7 @@ func ExampleClusterManagerClient_CompleteNodePoolUpgrade() {
 
 	req := &containerpb.CompleteNodePoolUpgradeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CompleteNodePoolUpgradeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CompleteNodePoolUpgradeRequest.
 	}
 	err = c.CompleteNodePoolUpgrade(ctx, req)
 	if err != nil {
@@ -627,7 +627,7 @@ func ExampleClusterManagerClient_RollbackNodePoolUpgrade() {
 
 	req := &containerpb.RollbackNodePoolUpgradeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#RollbackNodePoolUpgradeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#RollbackNodePoolUpgradeRequest.
 	}
 	resp, err := c.RollbackNodePoolUpgrade(ctx, req)
 	if err != nil {
@@ -652,7 +652,7 @@ func ExampleClusterManagerClient_SetNodePoolManagement() {
 
 	req := &containerpb.SetNodePoolManagementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetNodePoolManagementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetNodePoolManagementRequest.
 	}
 	resp, err := c.SetNodePoolManagement(ctx, req)
 	if err != nil {
@@ -677,7 +677,7 @@ func ExampleClusterManagerClient_SetLabels() {
 
 	req := &containerpb.SetLabelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetLabelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetLabelsRequest.
 	}
 	resp, err := c.SetLabels(ctx, req)
 	if err != nil {
@@ -702,7 +702,7 @@ func ExampleClusterManagerClient_SetLegacyAbac() {
 
 	req := &containerpb.SetLegacyAbacRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetLegacyAbacRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetLegacyAbacRequest.
 	}
 	resp, err := c.SetLegacyAbac(ctx, req)
 	if err != nil {
@@ -727,7 +727,7 @@ func ExampleClusterManagerClient_StartIPRotation() {
 
 	req := &containerpb.StartIPRotationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#StartIPRotationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#StartIPRotationRequest.
 	}
 	resp, err := c.StartIPRotation(ctx, req)
 	if err != nil {
@@ -752,7 +752,7 @@ func ExampleClusterManagerClient_CompleteIPRotation() {
 
 	req := &containerpb.CompleteIPRotationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CompleteIPRotationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CompleteIPRotationRequest.
 	}
 	resp, err := c.CompleteIPRotation(ctx, req)
 	if err != nil {
@@ -777,7 +777,7 @@ func ExampleClusterManagerClient_SetNodePoolSize() {
 
 	req := &containerpb.SetNodePoolSizeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetNodePoolSizeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetNodePoolSizeRequest.
 	}
 	resp, err := c.SetNodePoolSize(ctx, req)
 	if err != nil {
@@ -802,7 +802,7 @@ func ExampleClusterManagerClient_SetNetworkPolicy() {
 
 	req := &containerpb.SetNetworkPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetNetworkPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetNetworkPolicyRequest.
 	}
 	resp, err := c.SetNetworkPolicy(ctx, req)
 	if err != nil {
@@ -827,7 +827,7 @@ func ExampleClusterManagerClient_SetMaintenancePolicy() {
 
 	req := &containerpb.SetMaintenancePolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetMaintenancePolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetMaintenancePolicyRequest.
 	}
 	resp, err := c.SetMaintenancePolicy(ctx, req)
 	if err != nil {
@@ -852,7 +852,7 @@ func ExampleClusterManagerClient_ListUsableSubnetworks() {
 
 	req := &containerpb.ListUsableSubnetworksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListUsableSubnetworksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListUsableSubnetworksRequest.
 	}
 	it := c.ListUsableSubnetworks(ctx, req)
 	for {
diff --git a/container/apiv1/containerpb/cluster_service.pb.go b/container/apiv1/containerpb/cluster_service.pb.go
index 0b4c5676af8..aaa864c9445 100644
--- a/container/apiv1/containerpb/cluster_service.pb.go
+++ b/container/apiv1/containerpb/cluster_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/container/v1/cluster_service.proto
 
 package containerpb
@@ -25,10 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	code "google.golang.org/genproto/googleapis/rpc/code"
 	status "google.golang.org/genproto/googleapis/rpc/status"
@@ -37,6 +33,10 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -2145,7 +2145,7 @@ type NodeKubeletConfig struct {
 	// your pods to be in Guaranteed QoS class by specifying the CPU limits.
 	//
 	// The default value is 'true' if unspecified.
-	CpuCfsQuota *wrappers.BoolValue `protobuf:"bytes,2,opt,name=cpu_cfs_quota,json=cpuCfsQuota,proto3" json:"cpu_cfs_quota,omitempty"`
+	CpuCfsQuota *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=cpu_cfs_quota,json=cpuCfsQuota,proto3" json:"cpu_cfs_quota,omitempty"`
 	// Set the CPU CFS quota period value 'cpu.cfs_period_us'.
 	//
 	// The string must be a sequence of decimal numbers, each with optional
@@ -2200,7 +2200,7 @@ func (x *NodeKubeletConfig) GetCpuManagerPolicy() string {
 	return ""
 }
 
-func (x *NodeKubeletConfig) GetCpuCfsQuota() *wrappers.BoolValue {
+func (x *NodeKubeletConfig) GetCpuCfsQuota() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.CpuCfsQuota
 	}
@@ -8844,7 +8844,7 @@ type BlueGreenSettings struct {
 	RolloutPolicy isBlueGreenSettings_RolloutPolicy `protobuf_oneof:"rollout_policy"`
 	// Time needed after draining entire blue pool. After this period, blue pool
 	// will be cleaned up.
-	NodePoolSoakDuration *duration.Duration `protobuf:"bytes,2,opt,name=node_pool_soak_duration,json=nodePoolSoakDuration,proto3,oneof" json:"node_pool_soak_duration,omitempty"`
+	NodePoolSoakDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=node_pool_soak_duration,json=nodePoolSoakDuration,proto3,oneof" json:"node_pool_soak_duration,omitempty"`
 }
 
 func (x *BlueGreenSettings) Reset() {
@@ -8893,7 +8893,7 @@ func (x *BlueGreenSettings) GetStandardRolloutPolicy() *BlueGreenSettings_Standa
 	return nil
 }
 
-func (x *BlueGreenSettings) GetNodePoolSoakDuration() *duration.Duration {
+func (x *BlueGreenSettings) GetNodePoolSoakDuration() *durationpb.Duration {
 	if x != nil {
 		return x.NodePoolSoakDuration
 	}
@@ -9438,10 +9438,10 @@ type TimeWindow struct {
 	//	*TimeWindow_MaintenanceExclusionOptions
 	Options isTimeWindow_Options `protobuf_oneof:"options"`
 	// The time that the window first starts.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time that the window ends. The end time should take place after the
 	// start time.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *TimeWindow) Reset() {
@@ -9490,14 +9490,14 @@ func (x *TimeWindow) GetMaintenanceExclusionOptions() *MaintenanceExclusionOptio
 	return nil
 }
 
-func (x *TimeWindow) GetStartTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *TimeWindow) GetEndTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -12459,7 +12459,7 @@ type MeshCertificates struct {
 	// Requires Workload Identity
 	// ([workload_pool][google.container.v1.WorkloadIdentityConfig.workload_pool]
 	// must be non-empty).
-	EnableCertificates *wrappers.BoolValue `protobuf:"bytes,1,opt,name=enable_certificates,json=enableCertificates,proto3" json:"enable_certificates,omitempty"`
+	EnableCertificates *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=enable_certificates,json=enableCertificates,proto3" json:"enable_certificates,omitempty"`
 }
 
 func (x *MeshCertificates) Reset() {
@@ -12494,7 +12494,7 @@ func (*MeshCertificates) Descriptor() ([]byte, []int) {
 	return file_google_container_v1_cluster_service_proto_rawDescGZIP(), []int{109}
 }
 
-func (x *MeshCertificates) GetEnableCertificates() *wrappers.BoolValue {
+func (x *MeshCertificates) GetEnableCertificates() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.EnableCertificates
 	}
@@ -13244,7 +13244,7 @@ type UpgradeEvent struct {
 	// The operation associated with this upgrade.
 	Operation string `protobuf:"bytes,2,opt,name=operation,proto3" json:"operation,omitempty"`
 	// The time when the operation was started.
-	OperationStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=operation_start_time,json=operationStartTime,proto3" json:"operation_start_time,omitempty"`
+	OperationStartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=operation_start_time,json=operationStartTime,proto3" json:"operation_start_time,omitempty"`
 	// The current version before the upgrade.
 	CurrentVersion string `protobuf:"bytes,4,opt,name=current_version,json=currentVersion,proto3" json:"current_version,omitempty"`
 	// The target version for the upgrade.
@@ -13300,7 +13300,7 @@ func (x *UpgradeEvent) GetOperation() string {
 	return ""
 }
 
-func (x *UpgradeEvent) GetOperationStartTime() *timestamp.Timestamp {
+func (x *UpgradeEvent) GetOperationStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.OperationStartTime
 	}
@@ -14248,7 +14248,7 @@ type BlueGreenSettings_StandardRolloutPolicy struct {
 	//	*BlueGreenSettings_StandardRolloutPolicy_BatchNodeCount
 	UpdateBatchSize isBlueGreenSettings_StandardRolloutPolicy_UpdateBatchSize `protobuf_oneof:"update_batch_size"`
 	// Soak time after each batch gets drained. Default to zero.
-	BatchSoakDuration *duration.Duration `protobuf:"bytes,3,opt,name=batch_soak_duration,json=batchSoakDuration,proto3,oneof" json:"batch_soak_duration,omitempty"`
+	BatchSoakDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=batch_soak_duration,json=batchSoakDuration,proto3,oneof" json:"batch_soak_duration,omitempty"`
 }
 
 func (x *BlueGreenSettings_StandardRolloutPolicy) Reset() {
@@ -14304,7 +14304,7 @@ func (x *BlueGreenSettings_StandardRolloutPolicy) GetBatchNodeCount() int32 {
 	return 0
 }
 
-func (x *BlueGreenSettings_StandardRolloutPolicy) GetBatchSoakDuration() *duration.Duration {
+func (x *BlueGreenSettings_StandardRolloutPolicy) GetBatchSoakDuration() *durationpb.Duration {
 	if x != nil {
 		return x.BatchSoakDuration
 	}
@@ -18104,12 +18104,12 @@ var file_google_container_v1_cluster_service_proto_goTypes = []interface{}{
 	(*ResourceUsageExportConfig_ConsumptionMeteringConfig)(nil), // 183: google.container.v1.ResourceUsageExportConfig.ConsumptionMeteringConfig
 	(*NotificationConfig_PubSub)(nil),                           // 184: google.container.v1.NotificationConfig.PubSub
 	(*NotificationConfig_Filter)(nil),                           // 185: google.container.v1.NotificationConfig.Filter
-	(*wrappers.BoolValue)(nil),                                  // 186: google.protobuf.BoolValue
+	(*wrapperspb.BoolValue)(nil),                                // 186: google.protobuf.BoolValue
 	(*status.Status)(nil),                                       // 187: google.rpc.Status
-	(*duration.Duration)(nil),                                   // 188: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),                                 // 189: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                                 // 188: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                               // 189: google.protobuf.Timestamp
 	(code.Code)(0),                                              // 190: google.rpc.Code
-	(*empty.Empty)(nil),                                         // 191: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                       // 191: google.protobuf.Empty
 }
 var file_google_container_v1_cluster_service_proto_depIdxs = []int32{
 	167, // 0: google.container.v1.LinuxNodeConfig.sysctls:type_name -> google.container.v1.LinuxNodeConfig.SysctlsEntry
@@ -20265,7 +20265,7 @@ type ClusterManagerClient interface {
 	// 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)
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Returns configuration info about the Google Kubernetes Engine service.
 	GetServerConfig(ctx context.Context, in *GetServerConfigRequest, opts ...grpc.CallOption) (*ServerConfig, error)
 	// Gets the public component of the cluster signing keys in
@@ -20283,7 +20283,7 @@ type ClusterManagerClient interface {
 	DeleteNodePool(ctx context.Context, in *DeleteNodePoolRequest, opts ...grpc.CallOption) (*Operation, error)
 	// CompleteNodePoolUpgrade will signal an on-going node pool upgrade to
 	// complete.
-	CompleteNodePoolUpgrade(ctx context.Context, in *CompleteNodePoolUpgradeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	CompleteNodePoolUpgrade(ctx context.Context, in *CompleteNodePoolUpgradeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Rolls back a previously Aborted or Failed NodePool upgrade.
 	// This makes no changes if the last upgrade successfully completed.
 	RollbackNodePoolUpgrade(ctx context.Context, in *RollbackNodePoolUpgradeRequest, opts ...grpc.CallOption) (*Operation, error)
@@ -20453,8 +20453,8 @@ func (c *clusterManagerClient) GetOperation(ctx context.Context, in *GetOperatio
 	return out, nil
 }
 
-func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *clusterManagerClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CancelOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -20516,8 +20516,8 @@ func (c *clusterManagerClient) DeleteNodePool(ctx context.Context, in *DeleteNod
 	return out, nil
 }
 
-func (c *clusterManagerClient) CompleteNodePoolUpgrade(ctx context.Context, in *CompleteNodePoolUpgradeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *clusterManagerClient) CompleteNodePoolUpgrade(ctx context.Context, in *CompleteNodePoolUpgradeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.container.v1.ClusterManager/CompleteNodePoolUpgrade", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -20676,7 +20676,7 @@ type ClusterManagerServer interface {
 	// Gets the specified operation.
 	GetOperation(context.Context, *GetOperationRequest) (*Operation, error)
 	// Cancels the specified operation.
-	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
+	CancelOperation(context.Context, *CancelOperationRequest) (*emptypb.Empty, error)
 	// Returns configuration info about the Google Kubernetes Engine service.
 	GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error)
 	// Gets the public component of the cluster signing keys in
@@ -20694,7 +20694,7 @@ type ClusterManagerServer interface {
 	DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error)
 	// CompleteNodePoolUpgrade will signal an on-going node pool upgrade to
 	// complete.
-	CompleteNodePoolUpgrade(context.Context, *CompleteNodePoolUpgradeRequest) (*empty.Empty, error)
+	CompleteNodePoolUpgrade(context.Context, *CompleteNodePoolUpgradeRequest) (*emptypb.Empty, error)
 	// Rolls back a previously Aborted or Failed NodePool upgrade.
 	// This makes no changes if the last upgrade successfully completed.
 	RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error)
@@ -20769,7 +20769,7 @@ func (*UnimplementedClusterManagerServer) ListOperations(context.Context, *ListO
 func (*UnimplementedClusterManagerServer) GetOperation(context.Context, *GetOperationRequest) (*Operation, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method GetOperation not implemented")
 }
-func (*UnimplementedClusterManagerServer) CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error) {
+func (*UnimplementedClusterManagerServer) CancelOperation(context.Context, *CancelOperationRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method CancelOperation not implemented")
 }
 func (*UnimplementedClusterManagerServer) GetServerConfig(context.Context, *GetServerConfigRequest) (*ServerConfig, error) {
@@ -20790,7 +20790,7 @@ func (*UnimplementedClusterManagerServer) CreateNodePool(context.Context, *Creat
 func (*UnimplementedClusterManagerServer) DeleteNodePool(context.Context, *DeleteNodePoolRequest) (*Operation, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteNodePool not implemented")
 }
-func (*UnimplementedClusterManagerServer) CompleteNodePoolUpgrade(context.Context, *CompleteNodePoolUpgradeRequest) (*empty.Empty, error) {
+func (*UnimplementedClusterManagerServer) CompleteNodePoolUpgrade(context.Context, *CompleteNodePoolUpgradeRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method CompleteNodePoolUpgrade not implemented")
 }
 func (*UnimplementedClusterManagerServer) RollbackNodePoolUpgrade(context.Context, *RollbackNodePoolUpgradeRequest) (*Operation, error) {
diff --git a/container/apiv1/doc.go b/container/apiv1/doc.go
index 9e7a13ef71e..83acfc470e4 100644
--- a/container/apiv1/doc.go
+++ b/container/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &containerpb.ListClustersRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListClustersRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListClustersRequest.
 //	}
 //	resp, err := c.ListClusters(ctx, req)
 //	if err != nil {
diff --git a/container/go.mod b/container/go.mod
index 6dfdc7a0557..3e75e761e0a 100644
--- a/container/go.mod
+++ b/container/go.mod
@@ -3,11 +3,10 @@ module cloud.google.com/go/container
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go v0.105.0
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -15,13 +14,14 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/container/go.sum b/container/go.sum
index a61aca56062..491242bdd3b 100644
--- a/container/go.sum
+++ b/container/go.sum
@@ -1,8 +1,9 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -64,11 +65,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -81,8 +82,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -90,8 +91,8 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -99,8 +100,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b h1:IOQ/4u8ZSLV+xns0LQxzdAcdOJTDMWB+0shVM8KWXBE=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/datacatalog/apiv1/data_catalog_client.go b/datacatalog/apiv1/data_catalog_client.go
index db4a00458c4..0d9ec69395f 100644
--- a/datacatalog/apiv1/data_catalog_client.go
+++ b/datacatalog/apiv1/data_catalog_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/datacatalog/apiv1/data_catalog_client_example_test.go b/datacatalog/apiv1/data_catalog_client_example_test.go
index 1bacac3f1fd..e9b2efea9fd 100644
--- a/datacatalog/apiv1/data_catalog_client_example_test.go
+++ b/datacatalog/apiv1/data_catalog_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	"google.golang.org/api/iterator"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleClient_SearchCatalog() {
 
 	req := &datacatalogpb.SearchCatalogRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#SearchCatalogRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#SearchCatalogRequest.
 	}
 	it := c.SearchCatalog(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleClient_CreateEntryGroup() {
 
 	req := &datacatalogpb.CreateEntryGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateEntryGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateEntryGroupRequest.
 	}
 	resp, err := c.CreateEntryGroup(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleClient_GetEntryGroup() {
 
 	req := &datacatalogpb.GetEntryGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetEntryGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetEntryGroupRequest.
 	}
 	resp, err := c.GetEntryGroup(ctx, req)
 	if err != nil {
@@ -138,7 +138,7 @@ func ExampleClient_UpdateEntryGroup() {
 
 	req := &datacatalogpb.UpdateEntryGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateEntryGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateEntryGroupRequest.
 	}
 	resp, err := c.UpdateEntryGroup(ctx, req)
 	if err != nil {
@@ -163,7 +163,7 @@ func ExampleClient_DeleteEntryGroup() {
 
 	req := &datacatalogpb.DeleteEntryGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteEntryGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteEntryGroupRequest.
 	}
 	err = c.DeleteEntryGroup(ctx, req)
 	if err != nil {
@@ -186,7 +186,7 @@ func ExampleClient_ListEntryGroups() {
 
 	req := &datacatalogpb.ListEntryGroupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListEntryGroupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListEntryGroupsRequest.
 	}
 	it := c.ListEntryGroups(ctx, req)
 	for {
@@ -217,7 +217,7 @@ func ExampleClient_CreateEntry() {
 
 	req := &datacatalogpb.CreateEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateEntryRequest.
 	}
 	resp, err := c.CreateEntry(ctx, req)
 	if err != nil {
@@ -242,7 +242,7 @@ func ExampleClient_UpdateEntry() {
 
 	req := &datacatalogpb.UpdateEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateEntryRequest.
 	}
 	resp, err := c.UpdateEntry(ctx, req)
 	if err != nil {
@@ -267,7 +267,7 @@ func ExampleClient_DeleteEntry() {
 
 	req := &datacatalogpb.DeleteEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteEntryRequest.
 	}
 	err = c.DeleteEntry(ctx, req)
 	if err != nil {
@@ -290,7 +290,7 @@ func ExampleClient_GetEntry() {
 
 	req := &datacatalogpb.GetEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetEntryRequest.
 	}
 	resp, err := c.GetEntry(ctx, req)
 	if err != nil {
@@ -315,7 +315,7 @@ func ExampleClient_LookupEntry() {
 
 	req := &datacatalogpb.LookupEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#LookupEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#LookupEntryRequest.
 	}
 	resp, err := c.LookupEntry(ctx, req)
 	if err != nil {
@@ -340,7 +340,7 @@ func ExampleClient_ListEntries() {
 
 	req := &datacatalogpb.ListEntriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListEntriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListEntriesRequest.
 	}
 	it := c.ListEntries(ctx, req)
 	for {
@@ -371,7 +371,7 @@ func ExampleClient_ModifyEntryOverview() {
 
 	req := &datacatalogpb.ModifyEntryOverviewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ModifyEntryOverviewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ModifyEntryOverviewRequest.
 	}
 	resp, err := c.ModifyEntryOverview(ctx, req)
 	if err != nil {
@@ -396,7 +396,7 @@ func ExampleClient_ModifyEntryContacts() {
 
 	req := &datacatalogpb.ModifyEntryContactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ModifyEntryContactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ModifyEntryContactsRequest.
 	}
 	resp, err := c.ModifyEntryContacts(ctx, req)
 	if err != nil {
@@ -421,7 +421,7 @@ func ExampleClient_CreateTagTemplate() {
 
 	req := &datacatalogpb.CreateTagTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateTagTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateTagTemplateRequest.
 	}
 	resp, err := c.CreateTagTemplate(ctx, req)
 	if err != nil {
@@ -446,7 +446,7 @@ func ExampleClient_GetTagTemplate() {
 
 	req := &datacatalogpb.GetTagTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetTagTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetTagTemplateRequest.
 	}
 	resp, err := c.GetTagTemplate(ctx, req)
 	if err != nil {
@@ -471,7 +471,7 @@ func ExampleClient_UpdateTagTemplate() {
 
 	req := &datacatalogpb.UpdateTagTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateTagTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateTagTemplateRequest.
 	}
 	resp, err := c.UpdateTagTemplate(ctx, req)
 	if err != nil {
@@ -496,7 +496,7 @@ func ExampleClient_DeleteTagTemplate() {
 
 	req := &datacatalogpb.DeleteTagTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteTagTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteTagTemplateRequest.
 	}
 	err = c.DeleteTagTemplate(ctx, req)
 	if err != nil {
@@ -519,7 +519,7 @@ func ExampleClient_CreateTagTemplateField() {
 
 	req := &datacatalogpb.CreateTagTemplateFieldRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateTagTemplateFieldRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateTagTemplateFieldRequest.
 	}
 	resp, err := c.CreateTagTemplateField(ctx, req)
 	if err != nil {
@@ -544,7 +544,7 @@ func ExampleClient_UpdateTagTemplateField() {
 
 	req := &datacatalogpb.UpdateTagTemplateFieldRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateTagTemplateFieldRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateTagTemplateFieldRequest.
 	}
 	resp, err := c.UpdateTagTemplateField(ctx, req)
 	if err != nil {
@@ -569,7 +569,7 @@ func ExampleClient_RenameTagTemplateField() {
 
 	req := &datacatalogpb.RenameTagTemplateFieldRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#RenameTagTemplateFieldRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#RenameTagTemplateFieldRequest.
 	}
 	resp, err := c.RenameTagTemplateField(ctx, req)
 	if err != nil {
@@ -594,7 +594,7 @@ func ExampleClient_RenameTagTemplateFieldEnumValue() {
 
 	req := &datacatalogpb.RenameTagTemplateFieldEnumValueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#RenameTagTemplateFieldEnumValueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#RenameTagTemplateFieldEnumValueRequest.
 	}
 	resp, err := c.RenameTagTemplateFieldEnumValue(ctx, req)
 	if err != nil {
@@ -619,7 +619,7 @@ func ExampleClient_DeleteTagTemplateField() {
 
 	req := &datacatalogpb.DeleteTagTemplateFieldRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteTagTemplateFieldRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteTagTemplateFieldRequest.
 	}
 	err = c.DeleteTagTemplateField(ctx, req)
 	if err != nil {
@@ -642,7 +642,7 @@ func ExampleClient_CreateTag() {
 
 	req := &datacatalogpb.CreateTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateTagRequest.
 	}
 	resp, err := c.CreateTag(ctx, req)
 	if err != nil {
@@ -667,7 +667,7 @@ func ExampleClient_UpdateTag() {
 
 	req := &datacatalogpb.UpdateTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateTagRequest.
 	}
 	resp, err := c.UpdateTag(ctx, req)
 	if err != nil {
@@ -692,7 +692,7 @@ func ExampleClient_DeleteTag() {
 
 	req := &datacatalogpb.DeleteTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteTagRequest.
 	}
 	err = c.DeleteTag(ctx, req)
 	if err != nil {
@@ -715,7 +715,7 @@ func ExampleClient_ListTags() {
 
 	req := &datacatalogpb.ListTagsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListTagsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListTagsRequest.
 	}
 	it := c.ListTags(ctx, req)
 	for {
@@ -746,7 +746,7 @@ func ExampleClient_StarEntry() {
 
 	req := &datacatalogpb.StarEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#StarEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#StarEntryRequest.
 	}
 	resp, err := c.StarEntry(ctx, req)
 	if err != nil {
@@ -771,7 +771,7 @@ func ExampleClient_UnstarEntry() {
 
 	req := &datacatalogpb.UnstarEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UnstarEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UnstarEntryRequest.
 	}
 	resp, err := c.UnstarEntry(ctx, req)
 	if err != nil {
diff --git a/datacatalog/apiv1/datacatalogpb/bigquery.pb.go b/datacatalog/apiv1/datacatalogpb/bigquery.pb.go
index a09798f7859..2fdd97cda7e 100644
--- a/datacatalog/apiv1/datacatalogpb/bigquery.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/bigquery.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/bigquery.proto
 
 package datacatalogpb
diff --git a/datacatalog/apiv1/datacatalogpb/common.pb.go b/datacatalog/apiv1/datacatalogpb/common.pb.go
index 8962d0eb14f..385e3e11a51 100644
--- a/datacatalog/apiv1/datacatalogpb/common.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/common.proto
 
 package datacatalogpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -106,7 +106,7 @@ type PersonalDetails struct {
 	// True if the entry is starred by the user; false otherwise.
 	Starred bool `protobuf:"varint,1,opt,name=starred,proto3" json:"starred,omitempty"`
 	// Set if the entry is starred; unset otherwise.
-	StarTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=star_time,json=starTime,proto3" json:"star_time,omitempty"`
+	StarTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=star_time,json=starTime,proto3" json:"star_time,omitempty"`
 }
 
 func (x *PersonalDetails) Reset() {
@@ -148,7 +148,7 @@ func (x *PersonalDetails) GetStarred() bool {
 	return false
 }
 
-func (x *PersonalDetails) GetStarTime() *timestamp.Timestamp {
+func (x *PersonalDetails) GetStarTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StarTime
 	}
@@ -210,9 +210,9 @@ func file_google_cloud_datacatalog_v1_common_proto_rawDescGZIP() []byte {
 var file_google_cloud_datacatalog_v1_common_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_datacatalog_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_datacatalog_v1_common_proto_goTypes = []interface{}{
-	(IntegratedSystem)(0),       // 0: google.cloud.datacatalog.v1.IntegratedSystem
-	(*PersonalDetails)(nil),     // 1: google.cloud.datacatalog.v1.PersonalDetails
-	(*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp
+	(IntegratedSystem)(0),         // 0: google.cloud.datacatalog.v1.IntegratedSystem
+	(*PersonalDetails)(nil),       // 1: google.cloud.datacatalog.v1.PersonalDetails
+	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
 }
 var file_google_cloud_datacatalog_v1_common_proto_depIdxs = []int32{
 	2, // 0: google.cloud.datacatalog.v1.PersonalDetails.star_time:type_name -> google.protobuf.Timestamp
diff --git a/datacatalog/apiv1/datacatalogpb/data_source.pb.go b/datacatalog/apiv1/datacatalogpb/data_source.pb.go
index c1e8b5e032a..a111f498ab8 100644
--- a/datacatalog/apiv1/datacatalogpb/data_source.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/data_source.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/data_source.proto
 
 package datacatalogpb
diff --git a/datacatalog/apiv1/datacatalogpb/datacatalog.pb.go b/datacatalog/apiv1/datacatalogpb/datacatalog.pb.go
index 8e538c1d320..73dd5a61400 100644
--- a/datacatalog/apiv1/datacatalogpb/datacatalog.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/datacatalog.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/datacatalog.proto
 
 package datacatalogpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -585,7 +585,7 @@ type UpdateEntryGroupRequest struct {
 	// If this parameter is absent or empty, all modifiable fields
 	// are overwritten. If such fields are non-required and omitted in the
 	// request body, their values are emptied.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateEntryGroupRequest) Reset() {
@@ -627,7 +627,7 @@ func (x *UpdateEntryGroupRequest) GetEntryGroup() *EntryGroup {
 	return nil
 }
 
-func (x *UpdateEntryGroupRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEntryGroupRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -644,7 +644,7 @@ type GetEntryGroupRequest struct {
 	// Required. The name of the entry group to get.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The fields to return. If empty or omitted, all fields are returned.
-	ReadMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=read_mask,json=readMask,proto3" json:"read_mask,omitempty"`
+	ReadMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=read_mask,json=readMask,proto3" json:"read_mask,omitempty"`
 }
 
 func (x *GetEntryGroupRequest) Reset() {
@@ -686,7 +686,7 @@ func (x *GetEntryGroupRequest) GetName() string {
 	return ""
 }
 
-func (x *GetEntryGroupRequest) GetReadMask() *field_mask.FieldMask {
+func (x *GetEntryGroupRequest) GetReadMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.ReadMask
 	}
@@ -999,7 +999,7 @@ type UpdateEntryRequest struct {
 	// * `user_specified_system`
 	// * `linked_resource`
 	// * `source_system_timestamps`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateEntryRequest) Reset() {
@@ -1041,7 +1041,7 @@ func (x *UpdateEntryRequest) GetEntry() *Entry {
 	return nil
 }
 
-func (x *UpdateEntryRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEntryRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2438,7 +2438,7 @@ type UpdateTagTemplateRequest struct {
 	//
 	// Note: Updating the `is_publicly_readable` field may require up to 12
 	// hours to take effect in search results.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateTagTemplateRequest) Reset() {
@@ -2480,7 +2480,7 @@ func (x *UpdateTagTemplateRequest) GetTagTemplate() *TagTemplate {
 	return nil
 }
 
-func (x *UpdateTagTemplateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTagTemplateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2628,7 +2628,7 @@ type UpdateTagRequest struct {
 	// In general, if this parameter is absent or empty, all modifiable fields
 	// are overwritten. If such fields are non-required and omitted in the
 	// request body, their values are emptied.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateTagRequest) Reset() {
@@ -2670,7 +2670,7 @@ func (x *UpdateTagRequest) GetTag() *Tag {
 	return nil
 }
 
-func (x *UpdateTagRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTagRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2830,7 +2830,7 @@ type UpdateTagTemplateFieldRequest struct {
 	//
 	// Additionally, updating a template field from optional to required is
 	// *not* allowed.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateTagTemplateFieldRequest) Reset() {
@@ -2879,7 +2879,7 @@ func (x *UpdateTagTemplateFieldRequest) GetTagTemplateField() *TagTemplateField
 	return nil
 }
 
-func (x *UpdateTagTemplateFieldRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTagTemplateFieldRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3220,7 +3220,7 @@ type ListEntriesRequest struct {
 	//
 	// For example, to return a list of entries with only the `name` field,
 	// set `read_mask` to only one path with the `name` value.
-	ReadMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=read_mask,json=readMask,proto3" json:"read_mask,omitempty"`
+	ReadMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=read_mask,json=readMask,proto3" json:"read_mask,omitempty"`
 }
 
 func (x *ListEntriesRequest) Reset() {
@@ -3276,7 +3276,7 @@ func (x *ListEntriesRequest) GetPageToken() string {
 	return ""
 }
 
-func (x *ListEntriesRequest) GetReadMask() *field_mask.FieldMask {
+func (x *ListEntriesRequest) GetReadMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.ReadMask
 	}
@@ -5087,7 +5087,7 @@ var file_google_cloud_datacatalog_v1_datacatalog_proto_goTypes = []interface{}{
 	(*RoutineSpec_Argument)(nil),                   // 50: google.cloud.datacatalog.v1.RoutineSpec.Argument
 	(*Contacts_Person)(nil),                        // 51: google.cloud.datacatalog.v1.Contacts.Person
 	(*SearchCatalogResult)(nil),                    // 52: google.cloud.datacatalog.v1.SearchCatalogResult
-	(*field_mask.FieldMask)(nil),                   // 53: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                  // 53: google.protobuf.FieldMask
 	(IntegratedSystem)(0),                          // 54: google.cloud.datacatalog.v1.IntegratedSystem
 	(*GcsFilesetSpec)(nil),                         // 55: google.cloud.datacatalog.v1.GcsFilesetSpec
 	(*BigQueryTableSpec)(nil),                      // 56: google.cloud.datacatalog.v1.BigQueryTableSpec
@@ -5107,7 +5107,7 @@ var file_google_cloud_datacatalog_v1_datacatalog_proto_goTypes = []interface{}{
 	(*v1.SetIamPolicyRequest)(nil),                 // 70: google.iam.v1.SetIamPolicyRequest
 	(*v1.GetIamPolicyRequest)(nil),                 // 71: google.iam.v1.GetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),           // 72: google.iam.v1.TestIamPermissionsRequest
-	(*empty.Empty)(nil),                            // 73: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                          // 73: google.protobuf.Empty
 	(*v1.Policy)(nil),                              // 74: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil),          // 75: google.iam.v1.TestIamPermissionsResponse
 }
@@ -5930,7 +5930,7 @@ type DataCatalogClient interface {
 	// identified by the `name` parameter. For more information, see [Data Catalog
 	// resource
 	// project](https://cloud.google.com/data-catalog/docs/concepts/resource-project).
-	DeleteEntryGroup(ctx context.Context, in *DeleteEntryGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEntryGroup(ctx context.Context, in *DeleteEntryGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists entry groups.
 	ListEntryGroups(ctx context.Context, in *ListEntryGroupsRequest, opts ...grpc.CallOption) (*ListEntryGroupsResponse, error)
 	// Creates an entry.
@@ -5962,7 +5962,7 @@ type DataCatalogClient interface {
 	// the `name` parameter. For more information, see [Data Catalog
 	// resource
 	// project](https://cloud.google.com/data-catalog/docs/concepts/resource-project).
-	DeleteEntry(ctx context.Context, in *DeleteEntryRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEntry(ctx context.Context, in *DeleteEntryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets an entry.
 	GetEntry(ctx context.Context, in *GetEntryRequest, opts ...grpc.CallOption) (*Entry, error)
 	// Gets an entry by its target resource name.
@@ -6011,7 +6011,7 @@ type DataCatalogClient interface {
 	// You must enable the Data Catalog API in the project identified by
 	// the `name` parameter. For more information, see [Data Catalog resource
 	// project](https://cloud.google.com/data-catalog/docs/concepts/resource-project).
-	DeleteTagTemplate(ctx context.Context, in *DeleteTagTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTagTemplate(ctx context.Context, in *DeleteTagTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates a field in a tag template.
 	//
 	// You must enable the Data Catalog API in the project identified by
@@ -6043,7 +6043,7 @@ type DataCatalogClient interface {
 	// You must enable the Data Catalog API in the project identified by
 	// the `name` parameter. For more information, see [Data Catalog resource
 	// project](https://cloud.google.com/data-catalog/docs/concepts/resource-project).
-	DeleteTagTemplateField(ctx context.Context, in *DeleteTagTemplateFieldRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTagTemplateField(ctx context.Context, in *DeleteTagTemplateFieldRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates a tag and assigns it to:
 	//
 	//   - An [Entry][google.cloud.datacatalog.v1.Entry] if the method name is
@@ -6060,7 +6060,7 @@ type DataCatalogClient interface {
 	// Updates an existing tag.
 	UpdateTag(ctx context.Context, in *UpdateTagRequest, opts ...grpc.CallOption) (*Tag, error)
 	// Deletes a tag.
-	DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists tags assigned to an [Entry][google.cloud.datacatalog.v1.Entry].
 	// The [columns][google.cloud.datacatalog.v1.Tag.column] in the response are
 	// lowercased.
@@ -6172,8 +6172,8 @@ func (c *dataCatalogClient) UpdateEntryGroup(ctx context.Context, in *UpdateEntr
 	return out, nil
 }
 
-func (c *dataCatalogClient) DeleteEntryGroup(ctx context.Context, in *DeleteEntryGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dataCatalogClient) DeleteEntryGroup(ctx context.Context, in *DeleteEntryGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.datacatalog.v1.DataCatalog/DeleteEntryGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -6208,8 +6208,8 @@ func (c *dataCatalogClient) UpdateEntry(ctx context.Context, in *UpdateEntryRequ
 	return out, nil
 }
 
-func (c *dataCatalogClient) DeleteEntry(ctx context.Context, in *DeleteEntryRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dataCatalogClient) DeleteEntry(ctx context.Context, in *DeleteEntryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.datacatalog.v1.DataCatalog/DeleteEntry", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -6289,8 +6289,8 @@ func (c *dataCatalogClient) UpdateTagTemplate(ctx context.Context, in *UpdateTag
 	return out, nil
 }
 
-func (c *dataCatalogClient) DeleteTagTemplate(ctx context.Context, in *DeleteTagTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dataCatalogClient) DeleteTagTemplate(ctx context.Context, in *DeleteTagTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.datacatalog.v1.DataCatalog/DeleteTagTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -6334,8 +6334,8 @@ func (c *dataCatalogClient) RenameTagTemplateFieldEnumValue(ctx context.Context,
 	return out, nil
 }
 
-func (c *dataCatalogClient) DeleteTagTemplateField(ctx context.Context, in *DeleteTagTemplateFieldRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dataCatalogClient) DeleteTagTemplateField(ctx context.Context, in *DeleteTagTemplateFieldRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.datacatalog.v1.DataCatalog/DeleteTagTemplateField", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -6361,8 +6361,8 @@ func (c *dataCatalogClient) UpdateTag(ctx context.Context, in *UpdateTagRequest,
 	return out, nil
 }
 
-func (c *dataCatalogClient) DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dataCatalogClient) DeleteTag(ctx context.Context, in *DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.datacatalog.v1.DataCatalog/DeleteTag", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -6485,7 +6485,7 @@ type DataCatalogServer interface {
 	// identified by the `name` parameter. For more information, see [Data Catalog
 	// resource
 	// project](https://cloud.google.com/data-catalog/docs/concepts/resource-project).
-	DeleteEntryGroup(context.Context, *DeleteEntryGroupRequest) (*empty.Empty, error)
+	DeleteEntryGroup(context.Context, *DeleteEntryGroupRequest) (*emptypb.Empty, error)
 	// Lists entry groups.
 	ListEntryGroups(context.Context, *ListEntryGroupsRequest) (*ListEntryGroupsResponse, error)
 	// Creates an entry.
@@ -6517,7 +6517,7 @@ type DataCatalogServer interface {
 	// the `name` parameter. For more information, see [Data Catalog
 	// resource
 	// project](https://cloud.google.com/data-catalog/docs/concepts/resource-project).
-	DeleteEntry(context.Context, *DeleteEntryRequest) (*empty.Empty, error)
+	DeleteEntry(context.Context, *DeleteEntryRequest) (*emptypb.Empty, error)
 	// Gets an entry.
 	GetEntry(context.Context, *GetEntryRequest) (*Entry, error)
 	// Gets an entry by its target resource name.
@@ -6566,7 +6566,7 @@ type DataCatalogServer interface {
 	// You must enable the Data Catalog API in the project identified by
 	// the `name` parameter. For more information, see [Data Catalog resource
 	// project](https://cloud.google.com/data-catalog/docs/concepts/resource-project).
-	DeleteTagTemplate(context.Context, *DeleteTagTemplateRequest) (*empty.Empty, error)
+	DeleteTagTemplate(context.Context, *DeleteTagTemplateRequest) (*emptypb.Empty, error)
 	// Creates a field in a tag template.
 	//
 	// You must enable the Data Catalog API in the project identified by
@@ -6598,7 +6598,7 @@ type DataCatalogServer interface {
 	// You must enable the Data Catalog API in the project identified by
 	// the `name` parameter. For more information, see [Data Catalog resource
 	// project](https://cloud.google.com/data-catalog/docs/concepts/resource-project).
-	DeleteTagTemplateField(context.Context, *DeleteTagTemplateFieldRequest) (*empty.Empty, error)
+	DeleteTagTemplateField(context.Context, *DeleteTagTemplateFieldRequest) (*emptypb.Empty, error)
 	// Creates a tag and assigns it to:
 	//
 	//   - An [Entry][google.cloud.datacatalog.v1.Entry] if the method name is
@@ -6615,7 +6615,7 @@ type DataCatalogServer interface {
 	// Updates an existing tag.
 	UpdateTag(context.Context, *UpdateTagRequest) (*Tag, error)
 	// Deletes a tag.
-	DeleteTag(context.Context, *DeleteTagRequest) (*empty.Empty, error)
+	DeleteTag(context.Context, *DeleteTagRequest) (*emptypb.Empty, error)
 	// Lists tags assigned to an [Entry][google.cloud.datacatalog.v1.Entry].
 	// The [columns][google.cloud.datacatalog.v1.Tag.column] in the response are
 	// lowercased.
@@ -6699,7 +6699,7 @@ func (*UnimplementedDataCatalogServer) GetEntryGroup(context.Context, *GetEntryG
 func (*UnimplementedDataCatalogServer) UpdateEntryGroup(context.Context, *UpdateEntryGroupRequest) (*EntryGroup, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEntryGroup not implemented")
 }
-func (*UnimplementedDataCatalogServer) DeleteEntryGroup(context.Context, *DeleteEntryGroupRequest) (*empty.Empty, error) {
+func (*UnimplementedDataCatalogServer) DeleteEntryGroup(context.Context, *DeleteEntryGroupRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEntryGroup not implemented")
 }
 func (*UnimplementedDataCatalogServer) ListEntryGroups(context.Context, *ListEntryGroupsRequest) (*ListEntryGroupsResponse, error) {
@@ -6711,7 +6711,7 @@ func (*UnimplementedDataCatalogServer) CreateEntry(context.Context, *CreateEntry
 func (*UnimplementedDataCatalogServer) UpdateEntry(context.Context, *UpdateEntryRequest) (*Entry, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEntry not implemented")
 }
-func (*UnimplementedDataCatalogServer) DeleteEntry(context.Context, *DeleteEntryRequest) (*empty.Empty, error) {
+func (*UnimplementedDataCatalogServer) DeleteEntry(context.Context, *DeleteEntryRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEntry not implemented")
 }
 func (*UnimplementedDataCatalogServer) GetEntry(context.Context, *GetEntryRequest) (*Entry, error) {
@@ -6738,7 +6738,7 @@ func (*UnimplementedDataCatalogServer) GetTagTemplate(context.Context, *GetTagTe
 func (*UnimplementedDataCatalogServer) UpdateTagTemplate(context.Context, *UpdateTagTemplateRequest) (*TagTemplate, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateTagTemplate not implemented")
 }
-func (*UnimplementedDataCatalogServer) DeleteTagTemplate(context.Context, *DeleteTagTemplateRequest) (*empty.Empty, error) {
+func (*UnimplementedDataCatalogServer) DeleteTagTemplate(context.Context, *DeleteTagTemplateRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTagTemplate not implemented")
 }
 func (*UnimplementedDataCatalogServer) CreateTagTemplateField(context.Context, *CreateTagTemplateFieldRequest) (*TagTemplateField, error) {
@@ -6753,7 +6753,7 @@ func (*UnimplementedDataCatalogServer) RenameTagTemplateField(context.Context, *
 func (*UnimplementedDataCatalogServer) RenameTagTemplateFieldEnumValue(context.Context, *RenameTagTemplateFieldEnumValueRequest) (*TagTemplateField, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RenameTagTemplateFieldEnumValue not implemented")
 }
-func (*UnimplementedDataCatalogServer) DeleteTagTemplateField(context.Context, *DeleteTagTemplateFieldRequest) (*empty.Empty, error) {
+func (*UnimplementedDataCatalogServer) DeleteTagTemplateField(context.Context, *DeleteTagTemplateFieldRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTagTemplateField not implemented")
 }
 func (*UnimplementedDataCatalogServer) CreateTag(context.Context, *CreateTagRequest) (*Tag, error) {
@@ -6762,7 +6762,7 @@ func (*UnimplementedDataCatalogServer) CreateTag(context.Context, *CreateTagRequ
 func (*UnimplementedDataCatalogServer) UpdateTag(context.Context, *UpdateTagRequest) (*Tag, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateTag not implemented")
 }
-func (*UnimplementedDataCatalogServer) DeleteTag(context.Context, *DeleteTagRequest) (*empty.Empty, error) {
+func (*UnimplementedDataCatalogServer) DeleteTag(context.Context, *DeleteTagRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTag not implemented")
 }
 func (*UnimplementedDataCatalogServer) ListTags(context.Context, *ListTagsRequest) (*ListTagsResponse, error) {
diff --git a/datacatalog/apiv1/datacatalogpb/dataplex_spec.pb.go b/datacatalog/apiv1/datacatalogpb/dataplex_spec.pb.go
index 6831df8483d..d348a6abe91 100644
--- a/datacatalog/apiv1/datacatalogpb/dataplex_spec.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/dataplex_spec.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/dataplex_spec.proto
 
 package datacatalogpb
diff --git a/datacatalog/apiv1/datacatalogpb/gcs_fileset_spec.pb.go b/datacatalog/apiv1/datacatalogpb/gcs_fileset_spec.pb.go
index 172ab4206e8..7e57360b4f5 100644
--- a/datacatalog/apiv1/datacatalogpb/gcs_fileset_spec.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/gcs_fileset_spec.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/gcs_fileset_spec.proto
 
 package datacatalogpb
diff --git a/datacatalog/apiv1/datacatalogpb/physical_schema.pb.go b/datacatalog/apiv1/datacatalogpb/physical_schema.pb.go
index 6b39754c77a..0f689ed1d08 100644
--- a/datacatalog/apiv1/datacatalogpb/physical_schema.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/physical_schema.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/physical_schema.proto
 
 package datacatalogpb
diff --git a/datacatalog/apiv1/datacatalogpb/policytagmanager.pb.go b/datacatalog/apiv1/datacatalogpb/policytagmanager.pb.go
index 200f67f202e..2e487985779 100644
--- a/datacatalog/apiv1/datacatalogpb/policytagmanager.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/policytagmanager.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/policytagmanager.proto
 
 package datacatalogpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -463,7 +463,7 @@ type UpdateTaxonomyRequest struct {
 	//
 	// For more information, see [FieldMask]
 	// (https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask).
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateTaxonomyRequest) Reset() {
@@ -505,7 +505,7 @@ func (x *UpdateTaxonomyRequest) GetTaxonomy() *Taxonomy {
 	return nil
 }
 
-func (x *UpdateTaxonomyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTaxonomyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -821,7 +821,7 @@ type UpdatePolicyTagRequest struct {
 	// If not set, defaults to all updatable fields.
 	// For more information, see [FieldMask]
 	// (https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask).
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdatePolicyTagRequest) Reset() {
@@ -863,7 +863,7 @@ func (x *UpdatePolicyTagRequest) GetPolicyTag() *PolicyTag {
 	return nil
 }
 
-func (x *UpdatePolicyTagRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdatePolicyTagRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1454,11 +1454,11 @@ var file_google_cloud_datacatalog_v1_policytagmanager_proto_goTypes = []interfac
 	(*ListPolicyTagsResponse)(nil),        // 13: google.cloud.datacatalog.v1.ListPolicyTagsResponse
 	(*GetPolicyTagRequest)(nil),           // 14: google.cloud.datacatalog.v1.GetPolicyTagRequest
 	(*SystemTimestamps)(nil),              // 15: google.cloud.datacatalog.v1.SystemTimestamps
-	(*field_mask.FieldMask)(nil),          // 16: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),         // 16: google.protobuf.FieldMask
 	(*v1.GetIamPolicyRequest)(nil),        // 17: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 18: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 19: google.iam.v1.TestIamPermissionsRequest
-	(*empty.Empty)(nil),                   // 20: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                 // 20: google.protobuf.Empty
 	(*v1.Policy)(nil),                     // 21: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil), // 22: google.iam.v1.TestIamPermissionsResponse
 }
@@ -1722,7 +1722,7 @@ type PolicyTagManagerClient interface {
 	// Deletes a taxonomy, including all policy tags in this
 	// taxonomy, their associated policies, and the policy tags references from
 	// BigQuery columns.
-	DeleteTaxonomy(ctx context.Context, in *DeleteTaxonomyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTaxonomy(ctx context.Context, in *DeleteTaxonomyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates a taxonomy, including its display name,
 	// description, and activated policy types.
 	UpdateTaxonomy(ctx context.Context, in *UpdateTaxonomyRequest, opts ...grpc.CallOption) (*Taxonomy, error)
@@ -1739,7 +1739,7 @@ type PolicyTagManagerClient interface {
 	//   - Policies associated with the policy tag and its descendants
 	//   - References from BigQuery table schema of the policy tag and its
 	//     descendants
-	DeletePolicyTag(ctx context.Context, in *DeletePolicyTagRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeletePolicyTag(ctx context.Context, in *DeletePolicyTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates a policy tag, including its display
 	// name, description, and parent policy tag.
 	UpdatePolicyTag(ctx context.Context, in *UpdatePolicyTagRequest, opts ...grpc.CallOption) (*PolicyTag, error)
@@ -1773,8 +1773,8 @@ func (c *policyTagManagerClient) CreateTaxonomy(ctx context.Context, in *CreateT
 	return out, nil
 }
 
-func (c *policyTagManagerClient) DeleteTaxonomy(ctx context.Context, in *DeleteTaxonomyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *policyTagManagerClient) DeleteTaxonomy(ctx context.Context, in *DeleteTaxonomyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.datacatalog.v1.PolicyTagManager/DeleteTaxonomy", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1818,8 +1818,8 @@ func (c *policyTagManagerClient) CreatePolicyTag(ctx context.Context, in *Create
 	return out, nil
 }
 
-func (c *policyTagManagerClient) DeletePolicyTag(ctx context.Context, in *DeletePolicyTagRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *policyTagManagerClient) DeletePolicyTag(ctx context.Context, in *DeletePolicyTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.datacatalog.v1.PolicyTagManager/DeletePolicyTag", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1890,7 +1890,7 @@ type PolicyTagManagerServer interface {
 	// Deletes a taxonomy, including all policy tags in this
 	// taxonomy, their associated policies, and the policy tags references from
 	// BigQuery columns.
-	DeleteTaxonomy(context.Context, *DeleteTaxonomyRequest) (*empty.Empty, error)
+	DeleteTaxonomy(context.Context, *DeleteTaxonomyRequest) (*emptypb.Empty, error)
 	// Updates a taxonomy, including its display name,
 	// description, and activated policy types.
 	UpdateTaxonomy(context.Context, *UpdateTaxonomyRequest) (*Taxonomy, error)
@@ -1907,7 +1907,7 @@ type PolicyTagManagerServer interface {
 	//   - Policies associated with the policy tag and its descendants
 	//   - References from BigQuery table schema of the policy tag and its
 	//     descendants
-	DeletePolicyTag(context.Context, *DeletePolicyTagRequest) (*empty.Empty, error)
+	DeletePolicyTag(context.Context, *DeletePolicyTagRequest) (*emptypb.Empty, error)
 	// Updates a policy tag, including its display
 	// name, description, and parent policy tag.
 	UpdatePolicyTag(context.Context, *UpdatePolicyTagRequest) (*PolicyTag, error)
@@ -1931,7 +1931,7 @@ type UnimplementedPolicyTagManagerServer struct {
 func (*UnimplementedPolicyTagManagerServer) CreateTaxonomy(context.Context, *CreateTaxonomyRequest) (*Taxonomy, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateTaxonomy not implemented")
 }
-func (*UnimplementedPolicyTagManagerServer) DeleteTaxonomy(context.Context, *DeleteTaxonomyRequest) (*empty.Empty, error) {
+func (*UnimplementedPolicyTagManagerServer) DeleteTaxonomy(context.Context, *DeleteTaxonomyRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTaxonomy not implemented")
 }
 func (*UnimplementedPolicyTagManagerServer) UpdateTaxonomy(context.Context, *UpdateTaxonomyRequest) (*Taxonomy, error) {
@@ -1946,7 +1946,7 @@ func (*UnimplementedPolicyTagManagerServer) GetTaxonomy(context.Context, *GetTax
 func (*UnimplementedPolicyTagManagerServer) CreatePolicyTag(context.Context, *CreatePolicyTagRequest) (*PolicyTag, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreatePolicyTag not implemented")
 }
-func (*UnimplementedPolicyTagManagerServer) DeletePolicyTag(context.Context, *DeletePolicyTagRequest) (*empty.Empty, error) {
+func (*UnimplementedPolicyTagManagerServer) DeletePolicyTag(context.Context, *DeletePolicyTagRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletePolicyTag not implemented")
 }
 func (*UnimplementedPolicyTagManagerServer) UpdatePolicyTag(context.Context, *UpdatePolicyTagRequest) (*PolicyTag, error) {
diff --git a/datacatalog/apiv1/datacatalogpb/policytagmanagerserialization.pb.go b/datacatalog/apiv1/datacatalogpb/policytagmanagerserialization.pb.go
index 60a6d0b4794..8853293166e 100644
--- a/datacatalog/apiv1/datacatalogpb/policytagmanagerserialization.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/policytagmanagerserialization.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto
 
 package datacatalogpb
diff --git a/datacatalog/apiv1/datacatalogpb/schema.pb.go b/datacatalog/apiv1/datacatalogpb/schema.pb.go
index 67e08bbf74e..06605e1c272 100644
--- a/datacatalog/apiv1/datacatalogpb/schema.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/schema.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/schema.proto
 
 package datacatalogpb
diff --git a/datacatalog/apiv1/datacatalogpb/search.pb.go b/datacatalog/apiv1/datacatalogpb/search.pb.go
index fddd85a693c..e46e96a0662 100644
--- a/datacatalog/apiv1/datacatalogpb/search.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/search.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/search.proto
 
 package datacatalogpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -131,7 +131,7 @@ type SearchCatalogResult struct {
 	// `//bigquery.googleapis.com/projects/PROJECT_ID/datasets/DATASET_ID/tables/TABLE_ID`
 	LinkedResource string `protobuf:"bytes,4,opt,name=linked_resource,json=linkedResource,proto3" json:"linked_resource,omitempty"`
 	// The last modification timestamp of the entry in the source system.
-	ModifyTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=modify_time,json=modifyTime,proto3" json:"modify_time,omitempty"`
+	ModifyTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=modify_time,json=modifyTime,proto3" json:"modify_time,omitempty"`
 	// The source system of the entry. Applicable only when the
 	// `search_result_type` is `ENTRY`.
 	//
@@ -223,7 +223,7 @@ func (x *SearchCatalogResult) GetLinkedResource() string {
 	return ""
 }
 
-func (x *SearchCatalogResult) GetModifyTime() *timestamp.Timestamp {
+func (x *SearchCatalogResult) GetModifyTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ModifyTime
 	}
@@ -380,10 +380,10 @@ func file_google_cloud_datacatalog_v1_search_proto_rawDescGZIP() []byte {
 var file_google_cloud_datacatalog_v1_search_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_datacatalog_v1_search_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_datacatalog_v1_search_proto_goTypes = []interface{}{
-	(SearchResultType)(0),       // 0: google.cloud.datacatalog.v1.SearchResultType
-	(*SearchCatalogResult)(nil), // 1: google.cloud.datacatalog.v1.SearchCatalogResult
-	(*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp
-	(IntegratedSystem)(0),       // 3: google.cloud.datacatalog.v1.IntegratedSystem
+	(SearchResultType)(0),         // 0: google.cloud.datacatalog.v1.SearchResultType
+	(*SearchCatalogResult)(nil),   // 1: google.cloud.datacatalog.v1.SearchCatalogResult
+	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
+	(IntegratedSystem)(0),         // 3: google.cloud.datacatalog.v1.IntegratedSystem
 }
 var file_google_cloud_datacatalog_v1_search_proto_depIdxs = []int32{
 	0, // 0: google.cloud.datacatalog.v1.SearchCatalogResult.search_result_type:type_name -> google.cloud.datacatalog.v1.SearchResultType
diff --git a/datacatalog/apiv1/datacatalogpb/table_spec.pb.go b/datacatalog/apiv1/datacatalogpb/table_spec.pb.go
index dd5000b7ae4..096963e67b5 100644
--- a/datacatalog/apiv1/datacatalogpb/table_spec.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/table_spec.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/table_spec.proto
 
 package datacatalogpb
diff --git a/datacatalog/apiv1/datacatalogpb/tags.pb.go b/datacatalog/apiv1/datacatalogpb/tags.pb.go
index 10478a227ed..1244e358622 100644
--- a/datacatalog/apiv1/datacatalogpb/tags.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/tags.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/tags.proto
 
 package datacatalogpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -331,7 +331,7 @@ func (x *TagField) GetBoolValue() bool {
 	return false
 }
 
-func (x *TagField) GetTimestampValue() *timestamp.Timestamp {
+func (x *TagField) GetTimestampValue() *timestamppb.Timestamp {
 	if x, ok := x.GetKind().(*TagField_TimestampValue); ok {
 		return x.TimestampValue
 	}
@@ -382,7 +382,7 @@ type TagField_BoolValue struct {
 
 type TagField_TimestampValue struct {
 	// The value of a tag field with a timestamp type.
-	TimestampValue *timestamp.Timestamp `protobuf:"bytes,5,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
+	TimestampValue *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
 }
 
 type TagField_EnumValue_ struct {
@@ -1063,7 +1063,7 @@ var file_google_cloud_datacatalog_v1_tags_proto_goTypes = []interface{}{
 	nil,                                  // 8: google.cloud.datacatalog.v1.TagTemplate.FieldsEntry
 	(*FieldType_EnumType)(nil),           // 9: google.cloud.datacatalog.v1.FieldType.EnumType
 	(*FieldType_EnumType_EnumValue)(nil), // 10: google.cloud.datacatalog.v1.FieldType.EnumType.EnumValue
-	(*timestamp.Timestamp)(nil),          // 11: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),        // 11: google.protobuf.Timestamp
 }
 var file_google_cloud_datacatalog_v1_tags_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.datacatalog.v1.Tag.fields:type_name -> google.cloud.datacatalog.v1.Tag.FieldsEntry
diff --git a/datacatalog/apiv1/datacatalogpb/timestamps.pb.go b/datacatalog/apiv1/datacatalogpb/timestamps.pb.go
index ce191a3dd44..8a3da39d9b4 100644
--- a/datacatalog/apiv1/datacatalogpb/timestamps.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/timestamps.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/timestamps.proto
 
 package datacatalogpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -44,7 +44,7 @@ type SystemTimestamps struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Creation timestamp of the resource within the given system.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Timestamp of the last modification of the resource or its metadata within
 	// a given system.
 	//
@@ -52,11 +52,11 @@ type SystemTimestamps struct {
 	// timestamp.
 	// For example, BigQuery timestamps every metadata modification but not data
 	// or permission changes.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Expiration timestamp of the resource within the given system.
 	//
 	// Currently only applicable to BigQuery resources.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *SystemTimestamps) Reset() {
@@ -91,21 +91,21 @@ func (*SystemTimestamps) Descriptor() ([]byte, []int) {
 	return file_google_cloud_datacatalog_v1_timestamps_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *SystemTimestamps) GetCreateTime() *timestamp.Timestamp {
+func (x *SystemTimestamps) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *SystemTimestamps) GetUpdateTime() *timestamp.Timestamp {
+func (x *SystemTimestamps) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *SystemTimestamps) GetExpireTime() *timestamp.Timestamp {
+func (x *SystemTimestamps) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -167,8 +167,8 @@ func file_google_cloud_datacatalog_v1_timestamps_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_datacatalog_v1_timestamps_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_datacatalog_v1_timestamps_proto_goTypes = []interface{}{
-	(*SystemTimestamps)(nil),    // 0: google.cloud.datacatalog.v1.SystemTimestamps
-	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+	(*SystemTimestamps)(nil),      // 0: google.cloud.datacatalog.v1.SystemTimestamps
+	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 }
 var file_google_cloud_datacatalog_v1_timestamps_proto_depIdxs = []int32{
 	1, // 0: google.cloud.datacatalog.v1.SystemTimestamps.create_time:type_name -> google.protobuf.Timestamp
diff --git a/datacatalog/apiv1/datacatalogpb/usage.pb.go b/datacatalog/apiv1/datacatalogpb/usage.pb.go
index dc014fc75db..8c9056a5311 100644
--- a/datacatalog/apiv1/datacatalogpb/usage.pb.go
+++ b/datacatalog/apiv1/datacatalogpb/usage.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datacatalog/v1/usage.proto
 
 package datacatalogpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -131,7 +131,7 @@ type UsageSignal struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The end timestamp of the duration of usage statistics.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Usage statistics over each of the predefined time ranges.
 	//
 	// Supported time ranges are `{"24H", "7D", "30D"}`.
@@ -170,7 +170,7 @@ func (*UsageSignal) Descriptor() ([]byte, []int) {
 	return file_google_cloud_datacatalog_v1_usage_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *UsageSignal) GetUpdateTime() *timestamp.Timestamp {
+func (x *UsageSignal) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -258,10 +258,10 @@ func file_google_cloud_datacatalog_v1_usage_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_datacatalog_v1_usage_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_google_cloud_datacatalog_v1_usage_proto_goTypes = []interface{}{
-	(*UsageStats)(nil),          // 0: google.cloud.datacatalog.v1.UsageStats
-	(*UsageSignal)(nil),         // 1: google.cloud.datacatalog.v1.UsageSignal
-	nil,                         // 2: google.cloud.datacatalog.v1.UsageSignal.UsageWithinTimeRangeEntry
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(*UsageStats)(nil),            // 0: google.cloud.datacatalog.v1.UsageStats
+	(*UsageSignal)(nil),           // 1: google.cloud.datacatalog.v1.UsageSignal
+	nil,                           // 2: google.cloud.datacatalog.v1.UsageSignal.UsageWithinTimeRangeEntry
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
 }
 var file_google_cloud_datacatalog_v1_usage_proto_depIdxs = []int32{
 	3, // 0: google.cloud.datacatalog.v1.UsageSignal.update_time:type_name -> google.protobuf.Timestamp
diff --git a/datacatalog/apiv1/doc.go b/datacatalog/apiv1/doc.go
index bf60e8dcd13..e1a2c574f0b 100644
--- a/datacatalog/apiv1/doc.go
+++ b/datacatalog/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &datacatalogpb.SearchCatalogRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#SearchCatalogRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#SearchCatalogRequest.
 //	}
 //	it := c.SearchCatalog(ctx, req)
 //	for {
diff --git a/datacatalog/apiv1/policy_tag_manager_client.go b/datacatalog/apiv1/policy_tag_manager_client.go
index 6814e0f06f1..9b2b3853ef2 100644
--- a/datacatalog/apiv1/policy_tag_manager_client.go
+++ b/datacatalog/apiv1/policy_tag_manager_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/datacatalog/apiv1/policy_tag_manager_client_example_test.go b/datacatalog/apiv1/policy_tag_manager_client_example_test.go
index 660ad24dbc9..1d6356418c3 100644
--- a/datacatalog/apiv1/policy_tag_manager_client_example_test.go
+++ b/datacatalog/apiv1/policy_tag_manager_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	"google.golang.org/api/iterator"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExamplePolicyTagManagerClient_CreateTaxonomy() {
 
 	req := &datacatalogpb.CreateTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateTaxonomyRequest.
 	}
 	resp, err := c.CreateTaxonomy(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExamplePolicyTagManagerClient_DeleteTaxonomy() {
 
 	req := &datacatalogpb.DeleteTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteTaxonomyRequest.
 	}
 	err = c.DeleteTaxonomy(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExamplePolicyTagManagerClient_UpdateTaxonomy() {
 
 	req := &datacatalogpb.UpdateTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateTaxonomyRequest.
 	}
 	resp, err := c.UpdateTaxonomy(ctx, req)
 	if err != nil {
@@ -130,7 +130,7 @@ func ExamplePolicyTagManagerClient_ListTaxonomies() {
 
 	req := &datacatalogpb.ListTaxonomiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListTaxonomiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListTaxonomiesRequest.
 	}
 	it := c.ListTaxonomies(ctx, req)
 	for {
@@ -161,7 +161,7 @@ func ExamplePolicyTagManagerClient_GetTaxonomy() {
 
 	req := &datacatalogpb.GetTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetTaxonomyRequest.
 	}
 	resp, err := c.GetTaxonomy(ctx, req)
 	if err != nil {
@@ -186,7 +186,7 @@ func ExamplePolicyTagManagerClient_CreatePolicyTag() {
 
 	req := &datacatalogpb.CreatePolicyTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreatePolicyTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreatePolicyTagRequest.
 	}
 	resp, err := c.CreatePolicyTag(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExamplePolicyTagManagerClient_DeletePolicyTag() {
 
 	req := &datacatalogpb.DeletePolicyTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeletePolicyTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeletePolicyTagRequest.
 	}
 	err = c.DeletePolicyTag(ctx, req)
 	if err != nil {
@@ -234,7 +234,7 @@ func ExamplePolicyTagManagerClient_UpdatePolicyTag() {
 
 	req := &datacatalogpb.UpdatePolicyTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdatePolicyTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdatePolicyTagRequest.
 	}
 	resp, err := c.UpdatePolicyTag(ctx, req)
 	if err != nil {
@@ -259,7 +259,7 @@ func ExamplePolicyTagManagerClient_ListPolicyTags() {
 
 	req := &datacatalogpb.ListPolicyTagsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListPolicyTagsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListPolicyTagsRequest.
 	}
 	it := c.ListPolicyTags(ctx, req)
 	for {
@@ -290,7 +290,7 @@ func ExamplePolicyTagManagerClient_GetPolicyTag() {
 
 	req := &datacatalogpb.GetPolicyTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetPolicyTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetPolicyTagRequest.
 	}
 	resp, err := c.GetPolicyTag(ctx, req)
 	if err != nil {
diff --git a/datacatalog/apiv1/policy_tag_manager_serialization_client.go b/datacatalog/apiv1/policy_tag_manager_serialization_client.go
index 7a6e3d04275..5e3e0531957 100644
--- a/datacatalog/apiv1/policy_tag_manager_serialization_client.go
+++ b/datacatalog/apiv1/policy_tag_manager_serialization_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/datacatalog/apiv1/policy_tag_manager_serialization_client_example_test.go b/datacatalog/apiv1/policy_tag_manager_serialization_client_example_test.go
index 59865554db0..b1f812a02a4 100644
--- a/datacatalog/apiv1/policy_tag_manager_serialization_client_example_test.go
+++ b/datacatalog/apiv1/policy_tag_manager_serialization_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func ExampleNewPolicyTagManagerSerializationClient() {
@@ -55,7 +55,7 @@ func ExamplePolicyTagManagerSerializationClient_ReplaceTaxonomy() {
 
 	req := &datacatalogpb.ReplaceTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ReplaceTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ReplaceTaxonomyRequest.
 	}
 	resp, err := c.ReplaceTaxonomy(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExamplePolicyTagManagerSerializationClient_ImportTaxonomies() {
 
 	req := &datacatalogpb.ImportTaxonomiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ImportTaxonomiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ImportTaxonomiesRequest.
 	}
 	resp, err := c.ImportTaxonomies(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExamplePolicyTagManagerSerializationClient_ExportTaxonomies() {
 
 	req := &datacatalogpb.ExportTaxonomiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ExportTaxonomiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ExportTaxonomiesRequest.
 	}
 	resp, err := c.ExportTaxonomies(ctx, req)
 	if err != nil {
diff --git a/datacatalog/go.mod b/datacatalog/go.mod
index dd7d5293a49..f3a1ba2ff0b 100644
--- a/datacatalog/go.mod
+++ b/datacatalog/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/datacatalog/go.sum b/datacatalog/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/datacatalog/go.sum
+++ b/datacatalog/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/datafusion/aliasshim/aliasshim.go b/datafusion/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/datafusion/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/datafusion/apiv1/data_fusion_client.go b/datafusion/apiv1/data_fusion_client.go
index 6a11959f2f2..745e05c69f1 100644
--- a/datafusion/apiv1/data_fusion_client.go
+++ b/datafusion/apiv1/data_fusion_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/datafusion/apiv1/data_fusion_client_example_test.go b/datafusion/apiv1/data_fusion_client_example_test.go
index 4a84fa9ee2c..18a7fb60706 100644
--- a/datafusion/apiv1/data_fusion_client_example_test.go
+++ b/datafusion/apiv1/data_fusion_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	datafusion "cloud.google.com/go/datafusion/apiv1"
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 	"google.golang.org/api/iterator"
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListAvailableVersions() {
 
 	req := &datafusionpb.ListAvailableVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#ListAvailableVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#ListAvailableVersionsRequest.
 	}
 	it := c.ListAvailableVersions(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_ListInstances() {
 
 	req := &datafusionpb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
@@ -118,7 +118,7 @@ func ExampleClient_GetInstance() {
 
 	req := &datafusionpb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
@@ -143,7 +143,7 @@ func ExampleClient_CreateInstance() {
 
 	req := &datafusionpb.CreateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#CreateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#CreateInstanceRequest.
 	}
 	op, err := c.CreateInstance(ctx, req)
 	if err != nil {
@@ -173,7 +173,7 @@ func ExampleClient_DeleteInstance() {
 
 	req := &datafusionpb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
@@ -201,7 +201,7 @@ func ExampleClient_UpdateInstance() {
 
 	req := &datafusionpb.UpdateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#UpdateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#UpdateInstanceRequest.
 	}
 	op, err := c.UpdateInstance(ctx, req)
 	if err != nil {
@@ -231,7 +231,7 @@ func ExampleClient_RestartInstance() {
 
 	req := &datafusionpb.RestartInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#RestartInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#RestartInstanceRequest.
 	}
 	op, err := c.RestartInstance(ctx, req)
 	if err != nil {
diff --git a/datafusion/apiv1/datafusionpb/datafusion.pb.go b/datafusion/apiv1/datafusionpb/datafusion.pb.go
index c43b9412bc3..0eb5a8ac1f8 100644
--- a/datafusion/apiv1/datafusionpb/datafusion.pb.go
+++ b/datafusion/apiv1/datafusionpb/datafusion.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datafusion/v1/datafusion.proto
 
 package datafusionpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -703,9 +703,9 @@ type Instance struct {
 	// Data Fusion instance.
 	Options map[string]string `protobuf:"bytes,9,rep,name=options,proto3" json:"options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. The time the instance was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the instance was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The current state of this Data Fusion instance.
 	State Instance_State `protobuf:"varint,12,opt,name=state,proto3,enum=google.cloud.datafusion.v1.Instance_State" json:"state,omitempty"`
 	// Output only. Additional information about the current state of this Data
@@ -847,14 +847,14 @@ func (x *Instance) GetOptions() map[string]string {
 	return nil
 }
 
-func (x *Instance) GetCreateTime() *timestamp.Timestamp {
+func (x *Instance) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Instance) GetUpdateTime() *timestamp.Timestamp {
+func (x *Instance) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1463,7 +1463,7 @@ type UpdateInstanceRequest struct {
 	// A field will be overwritten if it is in the mask.
 	// If the user does not provide a mask, all the supported fields (labels,
 	// options, and version currently) will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateInstanceRequest) Reset() {
@@ -1505,7 +1505,7 @@ func (x *UpdateInstanceRequest) GetInstance() *Instance {
 	return nil
 }
 
-func (x *UpdateInstanceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateInstanceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1569,9 +1569,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Name of the verb executed by the operation.
@@ -1624,14 +1624,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_datafusion_v1_datafusion_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2158,8 +2158,8 @@ var file_google_cloud_datafusion_v1_datafusion_proto_goTypes = []interface{}{
 	nil,                                   // 21: google.cloud.datafusion.v1.Instance.LabelsEntry
 	nil,                                   // 22: google.cloud.datafusion.v1.Instance.OptionsEntry
 	nil,                                   // 23: google.cloud.datafusion.v1.OperationMetadata.AdditionalStatusEntry
-	(*timestamp.Timestamp)(nil),           // 24: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),          // 25: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),         // 24: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),         // 25: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),         // 26: google.longrunning.Operation
 }
 var file_google_cloud_datafusion_v1_datafusion_proto_depIdxs = []int32{
diff --git a/datafusion/apiv1/doc.go b/datafusion/apiv1/doc.go
index 8984acdb61d..acf398ffd06 100644
--- a/datafusion/apiv1/doc.go
+++ b/datafusion/apiv1/doc.go
@@ -63,7 +63,7 @@
 //
 //	req := &datafusionpb.ListAvailableVersionsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#ListAvailableVersionsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#ListAvailableVersionsRequest.
 //	}
 //	it := c.ListAvailableVersions(ctx, req)
 //	for {
diff --git a/datafusion/go.mod b/datafusion/go.mod
index a926d04cef2..2c8305fc0af 100644
--- a/datafusion/go.mod
+++ b/datafusion/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/datafusion
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/datafusion/go.sum b/datafusion/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/datafusion/go.sum
+++ b/datafusion/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/dataplex/aliasshim/aliasshim.go b/dataplex/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/dataplex/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/dataplex/apiv1/content_client.go b/dataplex/apiv1/content_client.go
index f59cafb633f..63233f940cf 100644
--- a/dataplex/apiv1/content_client.go
+++ b/dataplex/apiv1/content_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/dataplex/apiv1/content_client_example_test.go b/dataplex/apiv1/content_client_example_test.go
index e970393fe47..2da1f129e72 100644
--- a/dataplex/apiv1/content_client_example_test.go
+++ b/dataplex/apiv1/content_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleContentClient_CreateContent() {
 
 	req := &dataplexpb.CreateContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateContentRequest.
 	}
 	resp, err := c.CreateContent(ctx, req)
 	if err != nil {
@@ -84,7 +84,7 @@ func ExampleContentClient_UpdateContent() {
 
 	req := &dataplexpb.UpdateContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateContentRequest.
 	}
 	resp, err := c.UpdateContent(ctx, req)
 	if err != nil {
@@ -109,7 +109,7 @@ func ExampleContentClient_DeleteContent() {
 
 	req := &dataplexpb.DeleteContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteContentRequest.
 	}
 	err = c.DeleteContent(ctx, req)
 	if err != nil {
@@ -132,7 +132,7 @@ func ExampleContentClient_GetContent() {
 
 	req := &dataplexpb.GetContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetContentRequest.
 	}
 	resp, err := c.GetContent(ctx, req)
 	if err != nil {
@@ -232,7 +232,7 @@ func ExampleContentClient_ListContent() {
 
 	req := &dataplexpb.ListContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListContentRequest.
 	}
 	it := c.ListContent(ctx, req)
 	for {
diff --git a/dataplex/apiv1/dataplex_client.go b/dataplex/apiv1/dataplex_client.go
index bbd7a052213..ee5d58bd08c 100644
--- a/dataplex/apiv1/dataplex_client.go
+++ b/dataplex/apiv1/dataplex_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dataplex/apiv1/dataplex_client_example_test.go b/dataplex/apiv1/dataplex_client_example_test.go
index f4a1af5fc63..54cb7d3ede2 100644
--- a/dataplex/apiv1/dataplex_client_example_test.go
+++ b/dataplex/apiv1/dataplex_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleClient_CreateLake() {
 
 	req := &dataplexpb.CreateLakeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateLakeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateLakeRequest.
 	}
 	op, err := c.CreateLake(ctx, req)
 	if err != nil {
@@ -88,7 +88,7 @@ func ExampleClient_UpdateLake() {
 
 	req := &dataplexpb.UpdateLakeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateLakeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateLakeRequest.
 	}
 	op, err := c.UpdateLake(ctx, req)
 	if err != nil {
@@ -118,7 +118,7 @@ func ExampleClient_DeleteLake() {
 
 	req := &dataplexpb.DeleteLakeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteLakeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteLakeRequest.
 	}
 	op, err := c.DeleteLake(ctx, req)
 	if err != nil {
@@ -146,7 +146,7 @@ func ExampleClient_ListLakes() {
 
 	req := &dataplexpb.ListLakesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListLakesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListLakesRequest.
 	}
 	it := c.ListLakes(ctx, req)
 	for {
@@ -177,7 +177,7 @@ func ExampleClient_GetLake() {
 
 	req := &dataplexpb.GetLakeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetLakeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetLakeRequest.
 	}
 	resp, err := c.GetLake(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleClient_ListLakeActions() {
 
 	req := &dataplexpb.ListLakeActionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListLakeActionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListLakeActionsRequest.
 	}
 	it := c.ListLakeActions(ctx, req)
 	for {
@@ -233,7 +233,7 @@ func ExampleClient_CreateZone() {
 
 	req := &dataplexpb.CreateZoneRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateZoneRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateZoneRequest.
 	}
 	op, err := c.CreateZone(ctx, req)
 	if err != nil {
@@ -263,7 +263,7 @@ func ExampleClient_UpdateZone() {
 
 	req := &dataplexpb.UpdateZoneRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateZoneRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateZoneRequest.
 	}
 	op, err := c.UpdateZone(ctx, req)
 	if err != nil {
@@ -293,7 +293,7 @@ func ExampleClient_DeleteZone() {
 
 	req := &dataplexpb.DeleteZoneRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteZoneRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteZoneRequest.
 	}
 	op, err := c.DeleteZone(ctx, req)
 	if err != nil {
@@ -321,7 +321,7 @@ func ExampleClient_ListZones() {
 
 	req := &dataplexpb.ListZonesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListZonesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListZonesRequest.
 	}
 	it := c.ListZones(ctx, req)
 	for {
@@ -352,7 +352,7 @@ func ExampleClient_GetZone() {
 
 	req := &dataplexpb.GetZoneRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetZoneRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetZoneRequest.
 	}
 	resp, err := c.GetZone(ctx, req)
 	if err != nil {
@@ -377,7 +377,7 @@ func ExampleClient_ListZoneActions() {
 
 	req := &dataplexpb.ListZoneActionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListZoneActionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListZoneActionsRequest.
 	}
 	it := c.ListZoneActions(ctx, req)
 	for {
@@ -408,7 +408,7 @@ func ExampleClient_CreateAsset() {
 
 	req := &dataplexpb.CreateAssetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateAssetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateAssetRequest.
 	}
 	op, err := c.CreateAsset(ctx, req)
 	if err != nil {
@@ -438,7 +438,7 @@ func ExampleClient_UpdateAsset() {
 
 	req := &dataplexpb.UpdateAssetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateAssetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateAssetRequest.
 	}
 	op, err := c.UpdateAsset(ctx, req)
 	if err != nil {
@@ -468,7 +468,7 @@ func ExampleClient_DeleteAsset() {
 
 	req := &dataplexpb.DeleteAssetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteAssetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteAssetRequest.
 	}
 	op, err := c.DeleteAsset(ctx, req)
 	if err != nil {
@@ -496,7 +496,7 @@ func ExampleClient_ListAssets() {
 
 	req := &dataplexpb.ListAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListAssetsRequest.
 	}
 	it := c.ListAssets(ctx, req)
 	for {
@@ -527,7 +527,7 @@ func ExampleClient_GetAsset() {
 
 	req := &dataplexpb.GetAssetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetAssetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetAssetRequest.
 	}
 	resp, err := c.GetAsset(ctx, req)
 	if err != nil {
@@ -552,7 +552,7 @@ func ExampleClient_ListAssetActions() {
 
 	req := &dataplexpb.ListAssetActionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListAssetActionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListAssetActionsRequest.
 	}
 	it := c.ListAssetActions(ctx, req)
 	for {
@@ -583,7 +583,7 @@ func ExampleClient_CreateTask() {
 
 	req := &dataplexpb.CreateTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateTaskRequest.
 	}
 	op, err := c.CreateTask(ctx, req)
 	if err != nil {
@@ -613,7 +613,7 @@ func ExampleClient_UpdateTask() {
 
 	req := &dataplexpb.UpdateTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateTaskRequest.
 	}
 	op, err := c.UpdateTask(ctx, req)
 	if err != nil {
@@ -643,7 +643,7 @@ func ExampleClient_DeleteTask() {
 
 	req := &dataplexpb.DeleteTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteTaskRequest.
 	}
 	op, err := c.DeleteTask(ctx, req)
 	if err != nil {
@@ -671,7 +671,7 @@ func ExampleClient_ListTasks() {
 
 	req := &dataplexpb.ListTasksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListTasksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListTasksRequest.
 	}
 	it := c.ListTasks(ctx, req)
 	for {
@@ -702,7 +702,7 @@ func ExampleClient_GetTask() {
 
 	req := &dataplexpb.GetTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetTaskRequest.
 	}
 	resp, err := c.GetTask(ctx, req)
 	if err != nil {
@@ -727,7 +727,7 @@ func ExampleClient_ListJobs() {
 
 	req := &dataplexpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
@@ -758,7 +758,7 @@ func ExampleClient_GetJob() {
 
 	req := &dataplexpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
@@ -783,7 +783,7 @@ func ExampleClient_CancelJob() {
 
 	req := &dataplexpb.CancelJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CancelJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CancelJobRequest.
 	}
 	err = c.CancelJob(ctx, req)
 	if err != nil {
@@ -806,7 +806,7 @@ func ExampleClient_CreateEnvironment() {
 
 	req := &dataplexpb.CreateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateEnvironmentRequest.
 	}
 	op, err := c.CreateEnvironment(ctx, req)
 	if err != nil {
@@ -836,7 +836,7 @@ func ExampleClient_UpdateEnvironment() {
 
 	req := &dataplexpb.UpdateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateEnvironmentRequest.
 	}
 	op, err := c.UpdateEnvironment(ctx, req)
 	if err != nil {
@@ -866,7 +866,7 @@ func ExampleClient_DeleteEnvironment() {
 
 	req := &dataplexpb.DeleteEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteEnvironmentRequest.
 	}
 	op, err := c.DeleteEnvironment(ctx, req)
 	if err != nil {
@@ -894,7 +894,7 @@ func ExampleClient_ListEnvironments() {
 
 	req := &dataplexpb.ListEnvironmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListEnvironmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListEnvironmentsRequest.
 	}
 	it := c.ListEnvironments(ctx, req)
 	for {
@@ -925,7 +925,7 @@ func ExampleClient_GetEnvironment() {
 
 	req := &dataplexpb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
@@ -950,7 +950,7 @@ func ExampleClient_ListSessions() {
 
 	req := &dataplexpb.ListSessionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListSessionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListSessionsRequest.
 	}
 	it := c.ListSessions(ctx, req)
 	for {
diff --git a/dataplex/apiv1/dataplexpb/analyze.pb.go b/dataplex/apiv1/dataplexpb/analyze.pb.go
index 0ef7ff3a6f3..b6fc17c72d8 100644
--- a/dataplex/apiv1/dataplexpb/analyze.pb.go
+++ b/dataplex/apiv1/dataplexpb/analyze.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataplex/v1/analyze.proto
 
 package dataplexpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -152,9 +152,9 @@ type Environment struct {
 	// different if the environment is deleted and re-created with the same name.
 	Uid string `protobuf:"bytes,3,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. Environment creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the environment was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. User defined labels for the environment.
 	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. Description of the environment.
@@ -224,14 +224,14 @@ func (x *Environment) GetUid() string {
 	return ""
 }
 
-func (x *Environment) GetCreateTime() *timestamp.Timestamp {
+func (x *Environment) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Environment) GetUpdateTime() *timestamp.Timestamp {
+func (x *Environment) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -304,9 +304,9 @@ type Content struct {
 	// Limited to alphanumerics, hyphens, underscores, dots and slashes.
 	Path string `protobuf:"bytes,3,opt,name=path,proto3" json:"path,omitempty"`
 	// Output only. Content creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the content was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. User defined labels for the content.
 	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. Description of the content.
@@ -377,14 +377,14 @@ func (x *Content) GetPath() string {
 	return ""
 }
 
-func (x *Content) GetCreateTime() *timestamp.Timestamp {
+func (x *Content) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Content) GetUpdateTime() *timestamp.Timestamp {
+func (x *Content) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -481,8 +481,8 @@ type Session struct {
 	// Output only. Email of user running the session.
 	UserId string `protobuf:"bytes,2,opt,name=user_id,json=userId,proto3" json:"user_id,omitempty"`
 	// Output only. Session start time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
-	State      State                `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.dataplex.v1.State" json:"state,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	State      State                  `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.dataplex.v1.State" json:"state,omitempty"`
 }
 
 func (x *Session) Reset() {
@@ -531,7 +531,7 @@ func (x *Session) GetUserId() string {
 	return ""
 }
 
-func (x *Session) GetCreateTime() *timestamp.Timestamp {
+func (x *Session) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -654,7 +654,7 @@ type Environment_SessionSpec struct {
 
 	// Optional. The idle time configuration of the session. The session will be
 	// auto-terminated at the end of this period.
-	MaxIdleDuration *duration.Duration `protobuf:"bytes,1,opt,name=max_idle_duration,json=maxIdleDuration,proto3" json:"max_idle_duration,omitempty"`
+	MaxIdleDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=max_idle_duration,json=maxIdleDuration,proto3" json:"max_idle_duration,omitempty"`
 	// Optional. If True, this causes sessions to be pre-created and available for faster
 	// startup to enable interactive exploration use-cases. This defaults to
 	// False to avoid additional billed charges.
@@ -695,7 +695,7 @@ func (*Environment_SessionSpec) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_analyze_proto_rawDescGZIP(), []int{0, 1}
 }
 
-func (x *Environment_SessionSpec) GetMaxIdleDuration() *duration.Duration {
+func (x *Environment_SessionSpec) GetMaxIdleDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MaxIdleDuration
 	}
@@ -1335,13 +1335,13 @@ var file_google_cloud_dataplex_v1_analyze_proto_goTypes = []interface{}{
 	nil,                                    // 9: google.cloud.dataplex.v1.Environment.LabelsEntry
 	(*Environment_InfrastructureSpec_ComputeResources)(nil), // 10: google.cloud.dataplex.v1.Environment.InfrastructureSpec.ComputeResources
 	(*Environment_InfrastructureSpec_OsImageRuntime)(nil),   // 11: google.cloud.dataplex.v1.Environment.InfrastructureSpec.OsImageRuntime
-	nil,                         // 12: google.cloud.dataplex.v1.Environment.InfrastructureSpec.OsImageRuntime.PropertiesEntry
-	(*Content_SqlScript)(nil),   // 13: google.cloud.dataplex.v1.Content.SqlScript
-	(*Content_Notebook)(nil),    // 14: google.cloud.dataplex.v1.Content.Notebook
-	nil,                         // 15: google.cloud.dataplex.v1.Content.LabelsEntry
-	(*timestamp.Timestamp)(nil), // 16: google.protobuf.Timestamp
-	(State)(0),                  // 17: google.cloud.dataplex.v1.State
-	(*duration.Duration)(nil),   // 18: google.protobuf.Duration
+	nil,                           // 12: google.cloud.dataplex.v1.Environment.InfrastructureSpec.OsImageRuntime.PropertiesEntry
+	(*Content_SqlScript)(nil),     // 13: google.cloud.dataplex.v1.Content.SqlScript
+	(*Content_Notebook)(nil),      // 14: google.cloud.dataplex.v1.Content.Notebook
+	nil,                           // 15: google.cloud.dataplex.v1.Content.LabelsEntry
+	(*timestamppb.Timestamp)(nil), // 16: google.protobuf.Timestamp
+	(State)(0),                    // 17: google.cloud.dataplex.v1.State
+	(*durationpb.Duration)(nil),   // 18: google.protobuf.Duration
 }
 var file_google_cloud_dataplex_v1_analyze_proto_depIdxs = []int32{
 	16, // 0: google.cloud.dataplex.v1.Environment.create_time:type_name -> google.protobuf.Timestamp
diff --git a/dataplex/apiv1/dataplexpb/content.pb.go b/dataplex/apiv1/dataplexpb/content.pb.go
index 5d42784bbee..f1fd614c5f9 100644
--- a/dataplex/apiv1/dataplexpb/content.pb.go
+++ b/dataplex/apiv1/dataplexpb/content.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataplex/v1/content.proto
 
 package dataplexpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -174,7 +174,7 @@ type UpdateContentRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. Mask of fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Update description.
 	// Only fields specified in `update_mask` are updated.
 	Content *Content `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"`
@@ -215,7 +215,7 @@ func (*UpdateContentRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_content_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *UpdateContentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateContentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -746,11 +746,11 @@ var file_google_cloud_dataplex_v1_content_proto_goTypes = []interface{}{
 	(*ListContentResponse)(nil),           // 5: google.cloud.dataplex.v1.ListContentResponse
 	(*GetContentRequest)(nil),             // 6: google.cloud.dataplex.v1.GetContentRequest
 	(*Content)(nil),                       // 7: google.cloud.dataplex.v1.Content
-	(*field_mask.FieldMask)(nil),          // 8: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),         // 8: google.protobuf.FieldMask
 	(*v1.GetIamPolicyRequest)(nil),        // 9: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 10: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 11: google.iam.v1.TestIamPermissionsRequest
-	(*empty.Empty)(nil),                   // 12: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                 // 12: google.protobuf.Empty
 	(*v1.Policy)(nil),                     // 13: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil), // 14: google.iam.v1.TestIamPermissionsResponse
 }
@@ -901,7 +901,7 @@ type ContentServiceClient interface {
 	// Update a content. Only supports full resource update.
 	UpdateContent(ctx context.Context, in *UpdateContentRequest, opts ...grpc.CallOption) (*Content, error)
 	// Delete a content.
-	DeleteContent(ctx context.Context, in *DeleteContentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteContent(ctx context.Context, in *DeleteContentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Get a content resource.
 	GetContent(ctx context.Context, in *GetContentRequest, opts ...grpc.CallOption) (*Content, error)
 	// Gets the access control policy for a contentitem resource. A `NOT_FOUND`
@@ -958,8 +958,8 @@ func (c *contentServiceClient) UpdateContent(ctx context.Context, in *UpdateCont
 	return out, nil
 }
 
-func (c *contentServiceClient) DeleteContent(ctx context.Context, in *DeleteContentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *contentServiceClient) DeleteContent(ctx context.Context, in *DeleteContentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dataplex.v1.ContentService/DeleteContent", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1019,7 +1019,7 @@ type ContentServiceServer interface {
 	// Update a content. Only supports full resource update.
 	UpdateContent(context.Context, *UpdateContentRequest) (*Content, error)
 	// Delete a content.
-	DeleteContent(context.Context, *DeleteContentRequest) (*empty.Empty, error)
+	DeleteContent(context.Context, *DeleteContentRequest) (*emptypb.Empty, error)
 	// Get a content resource.
 	GetContent(context.Context, *GetContentRequest) (*Content, error)
 	// Gets the access control policy for a contentitem resource. A `NOT_FOUND`
@@ -1060,7 +1060,7 @@ func (*UnimplementedContentServiceServer) CreateContent(context.Context, *Create
 func (*UnimplementedContentServiceServer) UpdateContent(context.Context, *UpdateContentRequest) (*Content, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateContent not implemented")
 }
-func (*UnimplementedContentServiceServer) DeleteContent(context.Context, *DeleteContentRequest) (*empty.Empty, error) {
+func (*UnimplementedContentServiceServer) DeleteContent(context.Context, *DeleteContentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteContent not implemented")
 }
 func (*UnimplementedContentServiceServer) GetContent(context.Context, *GetContentRequest) (*Content, error) {
diff --git a/dataplex/apiv1/dataplexpb/logs.pb.go b/dataplex/apiv1/dataplexpb/logs.pb.go
index ebdccc4989a..a50a71f6eef 100644
--- a/dataplex/apiv1/dataplexpb/logs.pb.go
+++ b/dataplex/apiv1/dataplexpb/logs.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataplex/v1/logs.proto
 
 package dataplexpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -624,9 +624,9 @@ type JobEvent struct {
 	// The unique id identifying the job.
 	JobId string `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
 	// The time when the job started running.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time when the job ended running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The job state on completion.
 	State JobEvent_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.cloud.dataplex.v1.JobEvent_State" json:"state,omitempty"`
 	// The number of retries.
@@ -685,14 +685,14 @@ func (x *JobEvent) GetJobId() string {
 	return ""
 }
 
-func (x *JobEvent) GetStartTime() *timestamp.Timestamp {
+func (x *JobEvent) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *JobEvent) GetEndTime() *timestamp.Timestamp {
+func (x *JobEvent) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -762,7 +762,7 @@ type SessionEvent struct {
 	// and was pre-created before being assigned to a user.
 	FastStartupEnabled bool `protobuf:"varint,7,opt,name=fast_startup_enabled,json=fastStartupEnabled,proto3" json:"fast_startup_enabled,omitempty"`
 	// The idle duration of a warm pooled session before it is assigned to user.
-	UnassignedDuration *duration.Duration `protobuf:"bytes,8,opt,name=unassigned_duration,json=unassignedDuration,proto3" json:"unassigned_duration,omitempty"`
+	UnassignedDuration *durationpb.Duration `protobuf:"bytes,8,opt,name=unassigned_duration,json=unassignedDuration,proto3" json:"unassigned_duration,omitempty"`
 }
 
 func (x *SessionEvent) Reset() {
@@ -853,7 +853,7 @@ func (x *SessionEvent) GetFastStartupEnabled() bool {
 	return false
 }
 
-func (x *SessionEvent) GetUnassignedDuration() *duration.Duration {
+func (x *SessionEvent) GetUnassignedDuration() *durationpb.Duration {
 	if x != nil {
 		return x.UnassignedDuration
 	}
@@ -1124,7 +1124,7 @@ type SessionEvent_QueryDetail struct {
 	// Query Execution engine.
 	Engine SessionEvent_QueryDetail_Engine `protobuf:"varint,3,opt,name=engine,proto3,enum=google.cloud.dataplex.v1.SessionEvent_QueryDetail_Engine" json:"engine,omitempty"`
 	// Time taken for execution of the query.
-	Duration *duration.Duration `protobuf:"bytes,4,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,4,opt,name=duration,proto3" json:"duration,omitempty"`
 	// The size of results the query produced.
 	ResultSizeBytes int64 `protobuf:"varint,5,opt,name=result_size_bytes,json=resultSizeBytes,proto3" json:"result_size_bytes,omitempty"`
 	// The data processed by the query.
@@ -1184,7 +1184,7 @@ func (x *SessionEvent_QueryDetail) GetEngine() SessionEvent_QueryDetail_Engine {
 	return SessionEvent_QueryDetail_ENGINE_UNSPECIFIED
 }
 
-func (x *SessionEvent_QueryDetail) GetDuration() *duration.Duration {
+func (x *SessionEvent_QueryDetail) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -1438,8 +1438,8 @@ var file_google_cloud_dataplex_v1_logs_proto_goTypes = []interface{}{
 	(*DiscoveryEvent_ActionDetails)(nil),    // 13: google.cloud.dataplex.v1.DiscoveryEvent.ActionDetails
 	nil,                                     // 14: google.cloud.dataplex.v1.DiscoveryEvent.ConfigDetails.ParametersEntry
 	(*SessionEvent_QueryDetail)(nil),        // 15: google.cloud.dataplex.v1.SessionEvent.QueryDetail
-	(*timestamp.Timestamp)(nil),             // 16: google.protobuf.Timestamp
-	(*duration.Duration)(nil),               // 17: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),           // 16: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),             // 17: google.protobuf.Duration
 }
 var file_google_cloud_dataplex_v1_logs_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.dataplex.v1.DiscoveryEvent.type:type_name -> google.cloud.dataplex.v1.DiscoveryEvent.EventType
diff --git a/dataplex/apiv1/dataplexpb/metadata.pb.go b/dataplex/apiv1/dataplexpb/metadata.pb.go
index a840b1b1529..4a0a12532af 100644
--- a/dataplex/apiv1/dataplexpb/metadata.pb.go
+++ b/dataplex/apiv1/dataplexpb/metadata.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataplex/v1/metadata.proto
 
 package dataplexpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1388,9 +1388,9 @@ type Entity struct {
 	// 1024 characters.
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The time when the entity was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the entity was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Required. A user-provided entity ID. It is mutable, and will be used as the
 	// published table name. Specifying a new ID in an update entity
 	// request will override the existing value.
@@ -1484,14 +1484,14 @@ func (x *Entity) GetDescription() string {
 	return ""
 }
 
-func (x *Entity) GetCreateTime() *timestamp.Timestamp {
+func (x *Entity) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Entity) GetUpdateTime() *timestamp.Timestamp {
+func (x *Entity) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2810,8 +2810,8 @@ var file_google_cloud_dataplex_v1_metadata_proto_goTypes = []interface{}{
 	(*Schema_PartitionField)(nil),                    // 27: google.cloud.dataplex.v1.Schema.PartitionField
 	(*StorageFormat_CsvOptions)(nil),                 // 28: google.cloud.dataplex.v1.StorageFormat.CsvOptions
 	(*StorageFormat_JsonOptions)(nil),                // 29: google.cloud.dataplex.v1.StorageFormat.JsonOptions
-	(*timestamp.Timestamp)(nil),                      // 30: google.protobuf.Timestamp
-	(*empty.Empty)(nil),                              // 31: google.protobuf.Empty
+	(*timestamppb.Timestamp)(nil),                    // 30: google.protobuf.Timestamp
+	(*emptypb.Empty)(nil),                            // 31: google.protobuf.Empty
 }
 var file_google_cloud_dataplex_v1_metadata_proto_depIdxs = []int32{
 	20, // 0: google.cloud.dataplex.v1.CreateEntityRequest.entity:type_name -> google.cloud.dataplex.v1.Entity
@@ -3167,7 +3167,7 @@ type MetadataServiceClient interface {
 	// Update a metadata entity. Only supports full resource update.
 	UpdateEntity(ctx context.Context, in *UpdateEntityRequest, opts ...grpc.CallOption) (*Entity, error)
 	// Delete a metadata entity.
-	DeleteEntity(ctx context.Context, in *DeleteEntityRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEntity(ctx context.Context, in *DeleteEntityRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Get a metadata entity.
 	GetEntity(ctx context.Context, in *GetEntityRequest, opts ...grpc.CallOption) (*Entity, error)
 	// List metadata entities in a zone.
@@ -3175,7 +3175,7 @@ type MetadataServiceClient interface {
 	// Create a metadata partition.
 	CreatePartition(ctx context.Context, in *CreatePartitionRequest, opts ...grpc.CallOption) (*Partition, error)
 	// Delete a metadata partition.
-	DeletePartition(ctx context.Context, in *DeletePartitionRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeletePartition(ctx context.Context, in *DeletePartitionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Get a metadata partition of an entity.
 	GetPartition(ctx context.Context, in *GetPartitionRequest, opts ...grpc.CallOption) (*Partition, error)
 	// List metadata partitions of an entity.
@@ -3208,8 +3208,8 @@ func (c *metadataServiceClient) UpdateEntity(ctx context.Context, in *UpdateEnti
 	return out, nil
 }
 
-func (c *metadataServiceClient) DeleteEntity(ctx context.Context, in *DeleteEntityRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *metadataServiceClient) DeleteEntity(ctx context.Context, in *DeleteEntityRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dataplex.v1.MetadataService/DeleteEntity", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3244,8 +3244,8 @@ func (c *metadataServiceClient) CreatePartition(ctx context.Context, in *CreateP
 	return out, nil
 }
 
-func (c *metadataServiceClient) DeletePartition(ctx context.Context, in *DeletePartitionRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *metadataServiceClient) DeletePartition(ctx context.Context, in *DeletePartitionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dataplex.v1.MetadataService/DeletePartition", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3278,7 +3278,7 @@ type MetadataServiceServer interface {
 	// Update a metadata entity. Only supports full resource update.
 	UpdateEntity(context.Context, *UpdateEntityRequest) (*Entity, error)
 	// Delete a metadata entity.
-	DeleteEntity(context.Context, *DeleteEntityRequest) (*empty.Empty, error)
+	DeleteEntity(context.Context, *DeleteEntityRequest) (*emptypb.Empty, error)
 	// Get a metadata entity.
 	GetEntity(context.Context, *GetEntityRequest) (*Entity, error)
 	// List metadata entities in a zone.
@@ -3286,7 +3286,7 @@ type MetadataServiceServer interface {
 	// Create a metadata partition.
 	CreatePartition(context.Context, *CreatePartitionRequest) (*Partition, error)
 	// Delete a metadata partition.
-	DeletePartition(context.Context, *DeletePartitionRequest) (*empty.Empty, error)
+	DeletePartition(context.Context, *DeletePartitionRequest) (*emptypb.Empty, error)
 	// Get a metadata partition of an entity.
 	GetPartition(context.Context, *GetPartitionRequest) (*Partition, error)
 	// List metadata partitions of an entity.
@@ -3303,7 +3303,7 @@ func (*UnimplementedMetadataServiceServer) CreateEntity(context.Context, *Create
 func (*UnimplementedMetadataServiceServer) UpdateEntity(context.Context, *UpdateEntityRequest) (*Entity, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEntity not implemented")
 }
-func (*UnimplementedMetadataServiceServer) DeleteEntity(context.Context, *DeleteEntityRequest) (*empty.Empty, error) {
+func (*UnimplementedMetadataServiceServer) DeleteEntity(context.Context, *DeleteEntityRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEntity not implemented")
 }
 func (*UnimplementedMetadataServiceServer) GetEntity(context.Context, *GetEntityRequest) (*Entity, error) {
@@ -3315,7 +3315,7 @@ func (*UnimplementedMetadataServiceServer) ListEntities(context.Context, *ListEn
 func (*UnimplementedMetadataServiceServer) CreatePartition(context.Context, *CreatePartitionRequest) (*Partition, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreatePartition not implemented")
 }
-func (*UnimplementedMetadataServiceServer) DeletePartition(context.Context, *DeletePartitionRequest) (*empty.Empty, error) {
+func (*UnimplementedMetadataServiceServer) DeletePartition(context.Context, *DeletePartitionRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletePartition not implemented")
 }
 func (*UnimplementedMetadataServiceServer) GetPartition(context.Context, *GetPartitionRequest) (*Partition, error) {
diff --git a/dataplex/apiv1/dataplexpb/resources.pb.go b/dataplex/apiv1/dataplexpb/resources.pb.go
index 4bcf0c79b63..3bcf73476f9 100644
--- a/dataplex/apiv1/dataplexpb/resources.pb.go
+++ b/dataplex/apiv1/dataplexpb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataplex/v1/resources.proto
 
 package dataplexpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -683,9 +683,9 @@ type Lake struct {
 	// different if the lake is deleted and re-created with the same name.
 	Uid string `protobuf:"bytes,3,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The time when the lake was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the lake was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. User-defined labels for the lake.
 	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. Description of the lake.
@@ -757,14 +757,14 @@ func (x *Lake) GetUid() string {
 	return ""
 }
 
-func (x *Lake) GetCreateTime() *timestamp.Timestamp {
+func (x *Lake) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Lake) GetUpdateTime() *timestamp.Timestamp {
+func (x *Lake) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -827,7 +827,7 @@ type AssetStatus struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Last update time of the status.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Number of active assets.
 	ActiveAssets int32 `protobuf:"varint,2,opt,name=active_assets,json=activeAssets,proto3" json:"active_assets,omitempty"`
 	// Number of assets that are in process of updating the security policy on
@@ -867,7 +867,7 @@ func (*AssetStatus) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_resources_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *AssetStatus) GetUpdateTime() *timestamp.Timestamp {
+func (x *AssetStatus) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -906,9 +906,9 @@ type Zone struct {
 	// different if the zone is deleted and re-created with the same name.
 	Uid string `protobuf:"bytes,3,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The time when the zone was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the zone was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. User defined labels for the zone.
 	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. Description of the zone.
@@ -979,14 +979,14 @@ func (x *Zone) GetUid() string {
 	return ""
 }
 
-func (x *Zone) GetCreateTime() *timestamp.Timestamp {
+func (x *Zone) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Zone) GetUpdateTime() *timestamp.Timestamp {
+func (x *Zone) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1053,7 +1053,7 @@ type Action struct {
 	// Detailed description of the issue requiring action.
 	Issue string `protobuf:"bytes,2,opt,name=issue,proto3" json:"issue,omitempty"`
 	// The time that the issue was detected.
-	DetectTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=detect_time,json=detectTime,proto3" json:"detect_time,omitempty"`
+	DetectTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=detect_time,json=detectTime,proto3" json:"detect_time,omitempty"`
 	// Output only. The relative resource name of the action, of the form:
 	// `projects/{project}/locations/{location}/lakes/{lake}/actions/{action}`
 	// `projects/{project}/locations/{location}/lakes/{lake}/zones/{zone}/actions/{action}`
@@ -1135,7 +1135,7 @@ func (x *Action) GetIssue() string {
 	return ""
 }
 
-func (x *Action) GetDetectTime() *timestamp.Timestamp {
+func (x *Action) GetDetectTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DetectTime
 	}
@@ -1318,9 +1318,9 @@ type Asset struct {
 	// different if the asset is deleted and re-created with the same name.
 	Uid string `protobuf:"bytes,3,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The time when the asset was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the asset was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. User defined labels for the asset.
 	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Optional. Description of the asset.
@@ -1395,14 +1395,14 @@ func (x *Asset) GetUid() string {
 	return ""
 }
 
-func (x *Asset) GetCreateTime() *timestamp.Timestamp {
+func (x *Asset) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Asset) GetUpdateTime() *timestamp.Timestamp {
+func (x *Asset) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1528,7 +1528,7 @@ type Lake_MetastoreStatus struct {
 	// Additional information about the current status.
 	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
 	// Last update time of the metastore status of the lake.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The URI of the endpoint used to access the Metastore service.
 	Endpoint string `protobuf:"bytes,4,opt,name=endpoint,proto3" json:"endpoint,omitempty"`
 }
@@ -1579,7 +1579,7 @@ func (x *Lake_MetastoreStatus) GetMessage() string {
 	return ""
 }
 
-func (x *Lake_MetastoreStatus) GetUpdateTime() *timestamp.Timestamp {
+func (x *Lake_MetastoreStatus) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2341,7 +2341,7 @@ type Asset_SecurityStatus struct {
 	// Additional information about the current state.
 	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
 	// Last update time of the status.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Asset_SecurityStatus) Reset() {
@@ -2390,7 +2390,7 @@ func (x *Asset_SecurityStatus) GetMessage() string {
 	return ""
 }
 
-func (x *Asset_SecurityStatus) GetUpdateTime() *timestamp.Timestamp {
+func (x *Asset_SecurityStatus) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2601,7 +2601,7 @@ type Asset_ResourceStatus struct {
 	// Additional information about the current state.
 	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
 	// Last update time of the status.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Asset_ResourceStatus) Reset() {
@@ -2650,7 +2650,7 @@ func (x *Asset_ResourceStatus) GetMessage() string {
 	return ""
 }
 
-func (x *Asset_ResourceStatus) GetUpdateTime() *timestamp.Timestamp {
+func (x *Asset_ResourceStatus) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2668,13 +2668,13 @@ type Asset_DiscoveryStatus struct {
 	// Additional information about the current state.
 	Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
 	// Last update time of the status.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The start time of the last discovery run.
-	LastRunTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_run_time,json=lastRunTime,proto3" json:"last_run_time,omitempty"`
+	LastRunTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_run_time,json=lastRunTime,proto3" json:"last_run_time,omitempty"`
 	// Data Stats of the asset reported by discovery.
 	Stats *Asset_DiscoveryStatus_Stats `protobuf:"bytes,6,opt,name=stats,proto3" json:"stats,omitempty"`
 	// The duration of the last discovery run.
-	LastRunDuration *duration.Duration `protobuf:"bytes,7,opt,name=last_run_duration,json=lastRunDuration,proto3" json:"last_run_duration,omitempty"`
+	LastRunDuration *durationpb.Duration `protobuf:"bytes,7,opt,name=last_run_duration,json=lastRunDuration,proto3" json:"last_run_duration,omitempty"`
 }
 
 func (x *Asset_DiscoveryStatus) Reset() {
@@ -2723,14 +2723,14 @@ func (x *Asset_DiscoveryStatus) GetMessage() string {
 	return ""
 }
 
-func (x *Asset_DiscoveryStatus) GetUpdateTime() *timestamp.Timestamp {
+func (x *Asset_DiscoveryStatus) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Asset_DiscoveryStatus) GetLastRunTime() *timestamp.Timestamp {
+func (x *Asset_DiscoveryStatus) GetLastRunTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastRunTime
 	}
@@ -2744,7 +2744,7 @@ func (x *Asset_DiscoveryStatus) GetStats() *Asset_DiscoveryStatus_Stats {
 	return nil
 }
 
-func (x *Asset_DiscoveryStatus) GetLastRunDuration() *duration.Duration {
+func (x *Asset_DiscoveryStatus) GetLastRunDuration() *durationpb.Duration {
 	if x != nil {
 		return x.LastRunDuration
 	}
@@ -3607,8 +3607,8 @@ var file_google_cloud_dataplex_v1_resources_proto_goTypes = []interface{}{
 	(*Asset_DiscoverySpec_CsvOptions)(nil),              // 38: google.cloud.dataplex.v1.Asset.DiscoverySpec.CsvOptions
 	(*Asset_DiscoverySpec_JsonOptions)(nil),             // 39: google.cloud.dataplex.v1.Asset.DiscoverySpec.JsonOptions
 	(*Asset_DiscoveryStatus_Stats)(nil),                 // 40: google.cloud.dataplex.v1.Asset.DiscoveryStatus.Stats
-	(*timestamp.Timestamp)(nil),                         // 41: google.protobuf.Timestamp
-	(*duration.Duration)(nil),                           // 42: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                       // 41: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                         // 42: google.protobuf.Duration
 }
 var file_google_cloud_dataplex_v1_resources_proto_depIdxs = []int32{
 	41, // 0: google.cloud.dataplex.v1.Lake.create_time:type_name -> google.protobuf.Timestamp
diff --git a/dataplex/apiv1/dataplexpb/service.pb.go b/dataplex/apiv1/dataplexpb/service.pb.go
index 7698bbffa35..9bf8be34738 100644
--- a/dataplex/apiv1/dataplexpb/service.pb.go
+++ b/dataplex/apiv1/dataplexpb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataplex/v1/service.proto
 
 package dataplexpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -137,7 +137,7 @@ type UpdateLakeRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. Mask of fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Update description.
 	// Only fields specified in `update_mask` are updated.
 	Lake *Lake `protobuf:"bytes,2,opt,name=lake,proto3" json:"lake,omitempty"`
@@ -178,7 +178,7 @@ func (*UpdateLakeRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_service_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *UpdateLakeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateLakeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -683,7 +683,7 @@ type UpdateZoneRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. Mask of fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Update description.
 	// Only fields specified in `update_mask` are updated.
 	Zone *Zone `protobuf:"bytes,2,opt,name=zone,proto3" json:"zone,omitempty"`
@@ -724,7 +724,7 @@ func (*UpdateZoneRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_service_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *UpdateZoneRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateZoneRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1159,7 +1159,7 @@ type UpdateAssetRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. Mask of fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Update description.
 	// Only fields specified in `update_mask` are updated.
 	Asset *Asset `protobuf:"bytes,2,opt,name=asset,proto3" json:"asset,omitempty"`
@@ -1200,7 +1200,7 @@ func (*UpdateAssetRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_service_proto_rawDescGZIP(), []int{16}
 }
 
-func (x *UpdateAssetRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAssetRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1551,9 +1551,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -1601,14 +1601,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_service_proto_rawDescGZIP(), []int{22}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1735,7 +1735,7 @@ type UpdateTaskRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. Mask of fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Update description.
 	// Only fields specified in `update_mask` are updated.
 	Task *Task `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"`
@@ -1776,7 +1776,7 @@ func (*UpdateTaskRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_service_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *UpdateTaskRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTaskRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2377,7 +2377,7 @@ type UpdateEnvironmentRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. Mask of fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Update description.
 	// Only fields specified in `update_mask` are updated.
 	Environment *Environment `protobuf:"bytes,2,opt,name=environment,proto3" json:"environment,omitempty"`
@@ -2418,7 +2418,7 @@ func (*UpdateEnvironmentRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_service_proto_rawDescGZIP(), []int{34}
 }
 
-func (x *UpdateEnvironmentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEnvironmentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3725,17 +3725,17 @@ var file_google_cloud_dataplex_v1_service_proto_goTypes = []interface{}{
 	(*ListSessionsRequest)(nil),      // 39: google.cloud.dataplex.v1.ListSessionsRequest
 	(*ListSessionsResponse)(nil),     // 40: google.cloud.dataplex.v1.ListSessionsResponse
 	(*Lake)(nil),                     // 41: google.cloud.dataplex.v1.Lake
-	(*field_mask.FieldMask)(nil),     // 42: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),    // 42: google.protobuf.FieldMask
 	(*Action)(nil),                   // 43: google.cloud.dataplex.v1.Action
 	(*Zone)(nil),                     // 44: google.cloud.dataplex.v1.Zone
 	(*Asset)(nil),                    // 45: google.cloud.dataplex.v1.Asset
-	(*timestamp.Timestamp)(nil),      // 46: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),    // 46: google.protobuf.Timestamp
 	(*Task)(nil),                     // 47: google.cloud.dataplex.v1.Task
 	(*Job)(nil),                      // 48: google.cloud.dataplex.v1.Job
 	(*Environment)(nil),              // 49: google.cloud.dataplex.v1.Environment
 	(*Session)(nil),                  // 50: google.cloud.dataplex.v1.Session
 	(*longrunning.Operation)(nil),    // 51: google.longrunning.Operation
-	(*empty.Empty)(nil),              // 52: google.protobuf.Empty
+	(*emptypb.Empty)(nil),            // 52: google.protobuf.Empty
 }
 var file_google_cloud_dataplex_v1_service_proto_depIdxs = []int32{
 	41, // 0: google.cloud.dataplex.v1.CreateLakeRequest.lake:type_name -> google.cloud.dataplex.v1.Lake
@@ -4422,7 +4422,7 @@ type DataplexServiceClient interface {
 	// Get job resource.
 	GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error)
 	// Cancel jobs running for the task resource.
-	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Create an environment resource.
 	CreateEnvironment(ctx context.Context, in *CreateEnvironmentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Update the environment resource.
@@ -4671,8 +4671,8 @@ func (c *dataplexServiceClient) GetJob(ctx context.Context, in *GetJobRequest, o
 	return out, nil
 }
 
-func (c *dataplexServiceClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dataplexServiceClient) CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dataplex.v1.DataplexService/CancelJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -4790,7 +4790,7 @@ type DataplexServiceServer interface {
 	// Get job resource.
 	GetJob(context.Context, *GetJobRequest) (*Job, error)
 	// Cancel jobs running for the task resource.
-	CancelJob(context.Context, *CancelJobRequest) (*empty.Empty, error)
+	CancelJob(context.Context, *CancelJobRequest) (*emptypb.Empty, error)
 	// Create an environment resource.
 	CreateEnvironment(context.Context, *CreateEnvironmentRequest) (*longrunning.Operation, error)
 	// Update the environment resource.
@@ -4885,7 +4885,7 @@ func (*UnimplementedDataplexServiceServer) ListJobs(context.Context, *ListJobsRe
 func (*UnimplementedDataplexServiceServer) GetJob(context.Context, *GetJobRequest) (*Job, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetJob not implemented")
 }
-func (*UnimplementedDataplexServiceServer) CancelJob(context.Context, *CancelJobRequest) (*empty.Empty, error) {
+func (*UnimplementedDataplexServiceServer) CancelJob(context.Context, *CancelJobRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CancelJob not implemented")
 }
 func (*UnimplementedDataplexServiceServer) CreateEnvironment(context.Context, *CreateEnvironmentRequest) (*longrunning.Operation, error) {
diff --git a/dataplex/apiv1/dataplexpb/tasks.pb.go b/dataplex/apiv1/dataplexpb/tasks.pb.go
index f6afd4dc582..c884f5251fe 100644
--- a/dataplex/apiv1/dataplexpb/tasks.pb.go
+++ b/dataplex/apiv1/dataplexpb/tasks.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataplex/v1/tasks.proto
 
 package dataplexpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -221,9 +221,9 @@ type Task struct {
 	// different if the task is deleted and re-created with the same name.
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The time when the task was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the task was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Description of the task.
 	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Optional. User friendly display name.
@@ -293,14 +293,14 @@ func (x *Task) GetUid() string {
 	return ""
 }
 
-func (x *Task) GetCreateTime() *timestamp.Timestamp {
+func (x *Task) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Task) GetUpdateTime() *timestamp.Timestamp {
+func (x *Task) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -407,9 +407,9 @@ type Job struct {
 	// Output only. System generated globally unique ID for the job.
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The time when the job was started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. The time when the job ended.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Execution state for the job.
 	State Job_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.cloud.dataplex.v1.Job_State" json:"state,omitempty"`
 	// Output only. The number of times the job has been retried (excluding the
@@ -469,14 +469,14 @@ func (x *Job) GetUid() string {
 	return ""
 }
 
-func (x *Job) GetStartTime() *timestamp.Timestamp {
+func (x *Job) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Job) GetEndTime() *timestamp.Timestamp {
+func (x *Job) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -662,7 +662,7 @@ type Task_TriggerSpec struct {
 	// Optional. The first run of the task will be after this time.
 	// If not specified, the task will run shortly after being submitted if
 	// ON_DEMAND and based on the schedule if RECURRING.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Optional. Prevent the task from executing.
 	// This does not cancel already running tasks. It is intended to temporarily
 	// disable RECURRING tasks.
@@ -717,7 +717,7 @@ func (x *Task_TriggerSpec) GetType() Task_TriggerSpec_Type {
 	return Task_TriggerSpec_TYPE_UNSPECIFIED
 }
 
-func (x *Task_TriggerSpec) GetStartTime() *timestamp.Timestamp {
+func (x *Task_TriggerSpec) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -798,7 +798,7 @@ type Task_ExecutionSpec struct {
 	// [ExecutionSpec.service_account][google.cloud.dataplex.v1.Task.ExecutionSpec.service_account] must belong to this project.
 	Project string `protobuf:"bytes,7,opt,name=project,proto3" json:"project,omitempty"`
 	// Optional. The maximum duration after which the job execution is expired.
-	MaxJobExecutionLifetime *duration.Duration `protobuf:"bytes,8,opt,name=max_job_execution_lifetime,json=maxJobExecutionLifetime,proto3" json:"max_job_execution_lifetime,omitempty"`
+	MaxJobExecutionLifetime *durationpb.Duration `protobuf:"bytes,8,opt,name=max_job_execution_lifetime,json=maxJobExecutionLifetime,proto3" json:"max_job_execution_lifetime,omitempty"`
 	// Optional. The Cloud KMS key to use for encryption, of the form:
 	// `projects/{project_number}/locations/{location_id}/keyRings/{key-ring-name}/cryptoKeys/{key-name}`.
 	KmsKey string `protobuf:"bytes,9,opt,name=kms_key,json=kmsKey,proto3" json:"kms_key,omitempty"`
@@ -857,7 +857,7 @@ func (x *Task_ExecutionSpec) GetProject() string {
 	return ""
 }
 
-func (x *Task_ExecutionSpec) GetMaxJobExecutionLifetime() *duration.Duration {
+func (x *Task_ExecutionSpec) GetMaxJobExecutionLifetime() *durationpb.Duration {
 	if x != nil {
 		return x.MaxJobExecutionLifetime
 	}
@@ -1136,7 +1136,7 @@ type Task_ExecutionStatus struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. Last update time of the status.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. latest job execution
 	LatestJob *Job `protobuf:"bytes,9,opt,name=latest_job,json=latestJob,proto3" json:"latest_job,omitempty"`
 }
@@ -1173,7 +1173,7 @@ func (*Task_ExecutionStatus) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataplex_v1_tasks_proto_rawDescGZIP(), []int{0, 5}
 }
 
-func (x *Task_ExecutionStatus) GetUpdateTime() *timestamp.Timestamp {
+func (x *Task_ExecutionStatus) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1752,11 +1752,11 @@ var file_google_cloud_dataplex_v1_tasks_proto_goTypes = []interface{}{
 	(*Task_InfrastructureSpec_BatchComputeResources)(nil), // 12: google.cloud.dataplex.v1.Task.InfrastructureSpec.BatchComputeResources
 	(*Task_InfrastructureSpec_ContainerImageRuntime)(nil), // 13: google.cloud.dataplex.v1.Task.InfrastructureSpec.ContainerImageRuntime
 	(*Task_InfrastructureSpec_VpcNetwork)(nil),            // 14: google.cloud.dataplex.v1.Task.InfrastructureSpec.VpcNetwork
-	nil,                         // 15: google.cloud.dataplex.v1.Task.InfrastructureSpec.ContainerImageRuntime.PropertiesEntry
-	nil,                         // 16: google.cloud.dataplex.v1.Task.ExecutionSpec.ArgsEntry
-	(*timestamp.Timestamp)(nil), // 17: google.protobuf.Timestamp
-	(State)(0),                  // 18: google.cloud.dataplex.v1.State
-	(*duration.Duration)(nil),   // 19: google.protobuf.Duration
+	nil,                           // 15: google.cloud.dataplex.v1.Task.InfrastructureSpec.ContainerImageRuntime.PropertiesEntry
+	nil,                           // 16: google.cloud.dataplex.v1.Task.ExecutionSpec.ArgsEntry
+	(*timestamppb.Timestamp)(nil), // 17: google.protobuf.Timestamp
+	(State)(0),                    // 18: google.cloud.dataplex.v1.State
+	(*durationpb.Duration)(nil),   // 19: google.protobuf.Duration
 }
 var file_google_cloud_dataplex_v1_tasks_proto_depIdxs = []int32{
 	17, // 0: google.cloud.dataplex.v1.Task.create_time:type_name -> google.protobuf.Timestamp
diff --git a/dataplex/apiv1/doc.go b/dataplex/apiv1/doc.go
index e974d408384..c91bf3692e0 100644
--- a/dataplex/apiv1/doc.go
+++ b/dataplex/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &dataplexpb.CreateContentRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateContentRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateContentRequest.
 //	}
 //	resp, err := c.CreateContent(ctx, req)
 //	if err != nil {
diff --git a/dataplex/apiv1/metadata_client.go b/dataplex/apiv1/metadata_client.go
index 913602b289f..bdf2e31ed7e 100644
--- a/dataplex/apiv1/metadata_client.go
+++ b/dataplex/apiv1/metadata_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dataplex/apiv1/metadata_client_example_test.go b/dataplex/apiv1/metadata_client_example_test.go
index c3b8766df01..7f4ae0d8c2b 100644
--- a/dataplex/apiv1/metadata_client_example_test.go
+++ b/dataplex/apiv1/metadata_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleMetadataClient_CreateEntity() {
 
 	req := &dataplexpb.CreateEntityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateEntityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateEntityRequest.
 	}
 	resp, err := c.CreateEntity(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleMetadataClient_UpdateEntity() {
 
 	req := &dataplexpb.UpdateEntityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateEntityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateEntityRequest.
 	}
 	resp, err := c.UpdateEntity(ctx, req)
 	if err != nil {
@@ -108,7 +108,7 @@ func ExampleMetadataClient_DeleteEntity() {
 
 	req := &dataplexpb.DeleteEntityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteEntityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteEntityRequest.
 	}
 	err = c.DeleteEntity(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleMetadataClient_GetEntity() {
 
 	req := &dataplexpb.GetEntityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetEntityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetEntityRequest.
 	}
 	resp, err := c.GetEntity(ctx, req)
 	if err != nil {
@@ -156,7 +156,7 @@ func ExampleMetadataClient_ListEntities() {
 
 	req := &dataplexpb.ListEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListEntitiesRequest.
 	}
 	it := c.ListEntities(ctx, req)
 	for {
@@ -187,7 +187,7 @@ func ExampleMetadataClient_CreatePartition() {
 
 	req := &dataplexpb.CreatePartitionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreatePartitionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreatePartitionRequest.
 	}
 	resp, err := c.CreatePartition(ctx, req)
 	if err != nil {
@@ -212,7 +212,7 @@ func ExampleMetadataClient_DeletePartition() {
 
 	req := &dataplexpb.DeletePartitionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeletePartitionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeletePartitionRequest.
 	}
 	err = c.DeletePartition(ctx, req)
 	if err != nil {
@@ -235,7 +235,7 @@ func ExampleMetadataClient_GetPartition() {
 
 	req := &dataplexpb.GetPartitionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetPartitionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetPartitionRequest.
 	}
 	resp, err := c.GetPartition(ctx, req)
 	if err != nil {
@@ -260,7 +260,7 @@ func ExampleMetadataClient_ListPartitions() {
 
 	req := &dataplexpb.ListPartitionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListPartitionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListPartitionsRequest.
 	}
 	it := c.ListPartitions(ctx, req)
 	for {
diff --git a/dataplex/go.mod b/dataplex/go.mod
index 8f285ea60b4..b029de90cca 100644
--- a/dataplex/go.mod
+++ b/dataplex/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/dataplex
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/dataplex/go.sum b/dataplex/go.sum
index 5ae74cfc056..197b62f3d3c 100644
--- a/dataplex/go.sum
+++ b/dataplex/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b h1:IOQ/4u8ZSLV+xns0LQxzdAcdOJTDMWB+0shVM8KWXBE=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/dataproc/aliasshim/aliasshim.go b/dataproc/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/dataproc/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/dataproc/apiv1/autoscaling_policy_client.go b/dataproc/apiv1/autoscaling_policy_client.go
index 952bf7255f1..e5f1eba680d 100644
--- a/dataproc/apiv1/autoscaling_policy_client.go
+++ b/dataproc/apiv1/autoscaling_policy_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/dataproc/apiv1/autoscaling_policy_client_example_test.go b/dataproc/apiv1/autoscaling_policy_client_example_test.go
index aafe766dfb5..f8b36408ccb 100644
--- a/dataproc/apiv1/autoscaling_policy_client_example_test.go
+++ b/dataproc/apiv1/autoscaling_policy_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func ExampleNewAutoscalingPolicyClient() {
@@ -56,7 +56,7 @@ func ExampleAutoscalingPolicyClient_CreateAutoscalingPolicy() {
 
 	req := &dataprocpb.CreateAutoscalingPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateAutoscalingPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateAutoscalingPolicyRequest.
 	}
 	resp, err := c.CreateAutoscalingPolicy(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleAutoscalingPolicyClient_UpdateAutoscalingPolicy() {
 
 	req := &dataprocpb.UpdateAutoscalingPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#UpdateAutoscalingPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#UpdateAutoscalingPolicyRequest.
 	}
 	resp, err := c.UpdateAutoscalingPolicy(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleAutoscalingPolicyClient_GetAutoscalingPolicy() {
 
 	req := &dataprocpb.GetAutoscalingPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetAutoscalingPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetAutoscalingPolicyRequest.
 	}
 	resp, err := c.GetAutoscalingPolicy(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleAutoscalingPolicyClient_ListAutoscalingPolicies() {
 
 	req := &dataprocpb.ListAutoscalingPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListAutoscalingPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListAutoscalingPoliciesRequest.
 	}
 	it := c.ListAutoscalingPolicies(ctx, req)
 	for {
@@ -162,7 +162,7 @@ func ExampleAutoscalingPolicyClient_DeleteAutoscalingPolicy() {
 
 	req := &dataprocpb.DeleteAutoscalingPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteAutoscalingPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteAutoscalingPolicyRequest.
 	}
 	err = c.DeleteAutoscalingPolicy(ctx, req)
 	if err != nil {
diff --git a/dataproc/apiv1/batch_controller_client.go b/dataproc/apiv1/batch_controller_client.go
index df26594c11b..152890103a1 100644
--- a/dataproc/apiv1/batch_controller_client.go
+++ b/dataproc/apiv1/batch_controller_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/dataproc/apiv1/batch_controller_client_example_test.go b/dataproc/apiv1/batch_controller_client_example_test.go
index 3cc6c17d76b..09a9ea5e007 100644
--- a/dataproc/apiv1/batch_controller_client_example_test.go
+++ b/dataproc/apiv1/batch_controller_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func ExampleNewBatchControllerClient() {
@@ -56,7 +56,7 @@ func ExampleBatchControllerClient_CreateBatch() {
 
 	req := &dataprocpb.CreateBatchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateBatchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateBatchRequest.
 	}
 	op, err := c.CreateBatch(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleBatchControllerClient_GetBatch() {
 
 	req := &dataprocpb.GetBatchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetBatchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetBatchRequest.
 	}
 	resp, err := c.GetBatch(ctx, req)
 	if err != nil {
@@ -111,7 +111,7 @@ func ExampleBatchControllerClient_ListBatches() {
 
 	req := &dataprocpb.ListBatchesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListBatchesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListBatchesRequest.
 	}
 	it := c.ListBatches(ctx, req)
 	for {
@@ -142,7 +142,7 @@ func ExampleBatchControllerClient_DeleteBatch() {
 
 	req := &dataprocpb.DeleteBatchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteBatchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteBatchRequest.
 	}
 	err = c.DeleteBatch(ctx, req)
 	if err != nil {
diff --git a/dataproc/apiv1/cluster_controller_client.go b/dataproc/apiv1/cluster_controller_client.go
index c355f54ca2a..1536a7d3538 100644
--- a/dataproc/apiv1/cluster_controller_client.go
+++ b/dataproc/apiv1/cluster_controller_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/dataproc/apiv1/cluster_controller_client_example_test.go b/dataproc/apiv1/cluster_controller_client_example_test.go
index 00e9fc5efa3..f0eca685360 100644
--- a/dataproc/apiv1/cluster_controller_client_example_test.go
+++ b/dataproc/apiv1/cluster_controller_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func ExampleNewClusterControllerClient() {
@@ -56,7 +56,7 @@ func ExampleClusterControllerClient_CreateCluster() {
 
 	req := &dataprocpb.CreateClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateClusterRequest.
 	}
 	op, err := c.CreateCluster(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleClusterControllerClient_UpdateCluster() {
 
 	req := &dataprocpb.UpdateClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#UpdateClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#UpdateClusterRequest.
 	}
 	op, err := c.UpdateCluster(ctx, req)
 	if err != nil {
@@ -116,7 +116,7 @@ func ExampleClusterControllerClient_StopCluster() {
 
 	req := &dataprocpb.StopClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#StopClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#StopClusterRequest.
 	}
 	op, err := c.StopCluster(ctx, req)
 	if err != nil {
@@ -146,7 +146,7 @@ func ExampleClusterControllerClient_StartCluster() {
 
 	req := &dataprocpb.StartClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#StartClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#StartClusterRequest.
 	}
 	op, err := c.StartCluster(ctx, req)
 	if err != nil {
@@ -176,7 +176,7 @@ func ExampleClusterControllerClient_DeleteCluster() {
 
 	req := &dataprocpb.DeleteClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteClusterRequest.
 	}
 	op, err := c.DeleteCluster(ctx, req)
 	if err != nil {
@@ -204,7 +204,7 @@ func ExampleClusterControllerClient_GetCluster() {
 
 	req := &dataprocpb.GetClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetClusterRequest.
 	}
 	resp, err := c.GetCluster(ctx, req)
 	if err != nil {
@@ -229,7 +229,7 @@ func ExampleClusterControllerClient_ListClusters() {
 
 	req := &dataprocpb.ListClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListClustersRequest.
 	}
 	it := c.ListClusters(ctx, req)
 	for {
@@ -260,7 +260,7 @@ func ExampleClusterControllerClient_DiagnoseCluster() {
 
 	req := &dataprocpb.DiagnoseClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DiagnoseClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DiagnoseClusterRequest.
 	}
 	op, err := c.DiagnoseCluster(ctx, req)
 	if err != nil {
diff --git a/dataproc/apiv1/dataprocpb/autoscaling_policies.pb.go b/dataproc/apiv1/dataprocpb/autoscaling_policies.pb.go
index 4ed57c829e8..2f23e13bcc7 100644
--- a/dataproc/apiv1/dataprocpb/autoscaling_policies.pb.go
+++ b/dataproc/apiv1/dataprocpb/autoscaling_policies.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataproc/v1/autoscaling_policies.proto
 
 package dataprocpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -190,7 +190,7 @@ type BasicAutoscalingAlgorithm struct {
 	// the update operation from the previous event has completed.
 	//
 	// Bounds: [2m, 1d]. Default: 2m.
-	CooldownPeriod *duration.Duration `protobuf:"bytes,2,opt,name=cooldown_period,json=cooldownPeriod,proto3" json:"cooldown_period,omitempty"`
+	CooldownPeriod *durationpb.Duration `protobuf:"bytes,2,opt,name=cooldown_period,json=cooldownPeriod,proto3" json:"cooldown_period,omitempty"`
 }
 
 func (x *BasicAutoscalingAlgorithm) Reset() {
@@ -239,7 +239,7 @@ func (x *BasicAutoscalingAlgorithm) GetYarnConfig() *BasicYarnAutoscalingConfig
 	return nil
 }
 
-func (x *BasicAutoscalingAlgorithm) GetCooldownPeriod() *duration.Duration {
+func (x *BasicAutoscalingAlgorithm) GetCooldownPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.CooldownPeriod
 	}
@@ -269,7 +269,7 @@ type BasicYarnAutoscalingConfig struct {
 	// downscaling operations.
 	//
 	// Bounds: [0s, 1d].
-	GracefulDecommissionTimeout *duration.Duration `protobuf:"bytes,5,opt,name=graceful_decommission_timeout,json=gracefulDecommissionTimeout,proto3" json:"graceful_decommission_timeout,omitempty"`
+	GracefulDecommissionTimeout *durationpb.Duration `protobuf:"bytes,5,opt,name=graceful_decommission_timeout,json=gracefulDecommissionTimeout,proto3" json:"graceful_decommission_timeout,omitempty"`
 	// Required. Fraction of average YARN pending memory in the last cooldown period
 	// for which to add workers. A scale-up factor of 1.0 will result in scaling
 	// up so that there is no pending memory remaining after the update (more
@@ -342,7 +342,7 @@ func (*BasicYarnAutoscalingConfig) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataproc_v1_autoscaling_policies_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *BasicYarnAutoscalingConfig) GetGracefulDecommissionTimeout() *duration.Duration {
+func (x *BasicYarnAutoscalingConfig) GetGracefulDecommissionTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.GracefulDecommissionTimeout
 	}
@@ -1137,8 +1137,8 @@ var file_google_cloud_dataproc_v1_autoscaling_policies_proto_goTypes = []interfa
 	(*ListAutoscalingPoliciesRequest)(nil),       // 8: google.cloud.dataproc.v1.ListAutoscalingPoliciesRequest
 	(*ListAutoscalingPoliciesResponse)(nil),      // 9: google.cloud.dataproc.v1.ListAutoscalingPoliciesResponse
 	nil,                                          // 10: google.cloud.dataproc.v1.AutoscalingPolicy.LabelsEntry
-	(*duration.Duration)(nil),                    // 11: google.protobuf.Duration
-	(*empty.Empty)(nil),                          // 12: google.protobuf.Empty
+	(*durationpb.Duration)(nil),                  // 11: google.protobuf.Duration
+	(*emptypb.Empty)(nil),                        // 12: google.protobuf.Empty
 }
 var file_google_cloud_dataproc_v1_autoscaling_policies_proto_depIdxs = []int32{
 	1,  // 0: google.cloud.dataproc.v1.AutoscalingPolicy.basic_algorithm:type_name -> google.cloud.dataproc.v1.BasicAutoscalingAlgorithm
@@ -1346,7 +1346,7 @@ type AutoscalingPolicyServiceClient interface {
 	ListAutoscalingPolicies(ctx context.Context, in *ListAutoscalingPoliciesRequest, opts ...grpc.CallOption) (*ListAutoscalingPoliciesResponse, error)
 	// Deletes an autoscaling policy. It is an error to delete an autoscaling
 	// policy that is in use by one or more clusters.
-	DeleteAutoscalingPolicy(ctx context.Context, in *DeleteAutoscalingPolicyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAutoscalingPolicy(ctx context.Context, in *DeleteAutoscalingPolicyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type autoscalingPolicyServiceClient struct {
@@ -1393,8 +1393,8 @@ func (c *autoscalingPolicyServiceClient) ListAutoscalingPolicies(ctx context.Con
 	return out, nil
 }
 
-func (c *autoscalingPolicyServiceClient) DeleteAutoscalingPolicy(ctx context.Context, in *DeleteAutoscalingPolicyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *autoscalingPolicyServiceClient) DeleteAutoscalingPolicy(ctx context.Context, in *DeleteAutoscalingPolicyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.AutoscalingPolicyService/DeleteAutoscalingPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1417,7 +1417,7 @@ type AutoscalingPolicyServiceServer interface {
 	ListAutoscalingPolicies(context.Context, *ListAutoscalingPoliciesRequest) (*ListAutoscalingPoliciesResponse, error)
 	// Deletes an autoscaling policy. It is an error to delete an autoscaling
 	// policy that is in use by one or more clusters.
-	DeleteAutoscalingPolicy(context.Context, *DeleteAutoscalingPolicyRequest) (*empty.Empty, error)
+	DeleteAutoscalingPolicy(context.Context, *DeleteAutoscalingPolicyRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedAutoscalingPolicyServiceServer can be embedded to have forward compatible implementations.
@@ -1436,7 +1436,7 @@ func (*UnimplementedAutoscalingPolicyServiceServer) GetAutoscalingPolicy(context
 func (*UnimplementedAutoscalingPolicyServiceServer) ListAutoscalingPolicies(context.Context, *ListAutoscalingPoliciesRequest) (*ListAutoscalingPoliciesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListAutoscalingPolicies not implemented")
 }
-func (*UnimplementedAutoscalingPolicyServiceServer) DeleteAutoscalingPolicy(context.Context, *DeleteAutoscalingPolicyRequest) (*empty.Empty, error) {
+func (*UnimplementedAutoscalingPolicyServiceServer) DeleteAutoscalingPolicy(context.Context, *DeleteAutoscalingPolicyRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAutoscalingPolicy not implemented")
 }
 
diff --git a/dataproc/apiv1/dataprocpb/batches.pb.go b/dataproc/apiv1/dataprocpb/batches.pb.go
index 050ca44d936..a34121500bd 100644
--- a/dataproc/apiv1/dataprocpb/batches.pb.go
+++ b/dataproc/apiv1/dataprocpb/batches.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataproc/v1/batches.proto
 
 package dataprocpb
@@ -25,8 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -34,6 +32,8 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -441,7 +441,7 @@ type Batch struct {
 	// generates this value when it creates the batch.
 	Uuid string `protobuf:"bytes,2,opt,name=uuid,proto3" json:"uuid,omitempty"`
 	// Output only. The time when the batch was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The application/framework-specific portion of the batch configuration.
 	//
 	// Types that are assignable to BatchConfig:
@@ -459,7 +459,7 @@ type Batch struct {
 	// description if the state is `FAILED`.
 	StateMessage string `protobuf:"bytes,10,opt,name=state_message,json=stateMessage,proto3" json:"state_message,omitempty"`
 	// Output only. The time when the batch entered a current state.
-	StateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
+	StateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
 	// Output only. The email address of the user who created the batch.
 	Creator string `protobuf:"bytes,12,opt,name=creator,proto3" json:"creator,omitempty"`
 	// Optional. The labels to associate with this batch.
@@ -526,7 +526,7 @@ func (x *Batch) GetUuid() string {
 	return ""
 }
 
-func (x *Batch) GetCreateTime() *timestamp.Timestamp {
+func (x *Batch) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -589,7 +589,7 @@ func (x *Batch) GetStateMessage() string {
 	return ""
 }
 
-func (x *Batch) GetStateTime() *timestamp.Timestamp {
+func (x *Batch) GetStateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateTime
 	}
@@ -1073,7 +1073,7 @@ type Batch_StateHistory struct {
 	// Output only. Details about the state at this point in history.
 	StateMessage string `protobuf:"bytes,2,opt,name=state_message,json=stateMessage,proto3" json:"state_message,omitempty"`
 	// Output only. The time when the batch entered the historical state.
-	StateStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
+	StateStartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
 }
 
 func (x *Batch_StateHistory) Reset() {
@@ -1122,7 +1122,7 @@ func (x *Batch_StateHistory) GetStateMessage() string {
 	return ""
 }
 
-func (x *Batch_StateHistory) GetStateStartTime() *timestamp.Timestamp {
+func (x *Batch_StateHistory) GetStateStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateStartTime
 	}
@@ -1441,12 +1441,12 @@ var file_google_cloud_dataproc_v1_batches_proto_goTypes = []interface{}{
 	(*Batch_StateHistory)(nil),    // 11: google.cloud.dataproc.v1.Batch.StateHistory
 	nil,                           // 12: google.cloud.dataproc.v1.Batch.LabelsEntry
 	nil,                           // 13: google.cloud.dataproc.v1.SparkSqlBatch.QueryVariablesEntry
-	(*timestamp.Timestamp)(nil),   // 14: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil), // 14: google.protobuf.Timestamp
 	(*RuntimeInfo)(nil),           // 15: google.cloud.dataproc.v1.RuntimeInfo
 	(*RuntimeConfig)(nil),         // 16: google.cloud.dataproc.v1.RuntimeConfig
 	(*EnvironmentConfig)(nil),     // 17: google.cloud.dataproc.v1.EnvironmentConfig
 	(*longrunning.Operation)(nil), // 18: google.longrunning.Operation
-	(*empty.Empty)(nil),           // 19: google.protobuf.Empty
+	(*emptypb.Empty)(nil),         // 19: google.protobuf.Empty
 }
 var file_google_cloud_dataproc_v1_batches_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.dataproc.v1.CreateBatchRequest.batch:type_name -> google.cloud.dataproc.v1.Batch
@@ -1672,7 +1672,7 @@ type BatchControllerClient interface {
 	ListBatches(ctx context.Context, in *ListBatchesRequest, opts ...grpc.CallOption) (*ListBatchesResponse, error)
 	// Deletes the batch workload resource. If the batch is not in terminal state,
 	// the delete fails and the response returns `FAILED_PRECONDITION`.
-	DeleteBatch(ctx context.Context, in *DeleteBatchRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteBatch(ctx context.Context, in *DeleteBatchRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type batchControllerClient struct {
@@ -1710,8 +1710,8 @@ func (c *batchControllerClient) ListBatches(ctx context.Context, in *ListBatches
 	return out, nil
 }
 
-func (c *batchControllerClient) DeleteBatch(ctx context.Context, in *DeleteBatchRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *batchControllerClient) DeleteBatch(ctx context.Context, in *DeleteBatchRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.BatchController/DeleteBatch", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1729,7 +1729,7 @@ type BatchControllerServer interface {
 	ListBatches(context.Context, *ListBatchesRequest) (*ListBatchesResponse, error)
 	// Deletes the batch workload resource. If the batch is not in terminal state,
 	// the delete fails and the response returns `FAILED_PRECONDITION`.
-	DeleteBatch(context.Context, *DeleteBatchRequest) (*empty.Empty, error)
+	DeleteBatch(context.Context, *DeleteBatchRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedBatchControllerServer can be embedded to have forward compatible implementations.
@@ -1745,7 +1745,7 @@ func (*UnimplementedBatchControllerServer) GetBatch(context.Context, *GetBatchRe
 func (*UnimplementedBatchControllerServer) ListBatches(context.Context, *ListBatchesRequest) (*ListBatchesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListBatches not implemented")
 }
-func (*UnimplementedBatchControllerServer) DeleteBatch(context.Context, *DeleteBatchRequest) (*empty.Empty, error) {
+func (*UnimplementedBatchControllerServer) DeleteBatch(context.Context, *DeleteBatchRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteBatch not implemented")
 }
 
diff --git a/dataproc/apiv1/dataprocpb/clusters.pb.go b/dataproc/apiv1/dataprocpb/clusters.pb.go
index 9e3a4517082..78c3f5b5aff 100644
--- a/dataproc/apiv1/dataprocpb/clusters.pb.go
+++ b/dataproc/apiv1/dataprocpb/clusters.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataproc/v1/clusters.proto
 
 package dataprocpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1940,7 +1940,7 @@ type NodeInitializationAction struct {
 	// Cluster creation fails with an explanatory error message (the
 	// name of the executable that caused the error and the exceeded timeout
 	// period) if the executable is not completed at end of the timeout period.
-	ExecutionTimeout *duration.Duration `protobuf:"bytes,2,opt,name=execution_timeout,json=executionTimeout,proto3" json:"execution_timeout,omitempty"`
+	ExecutionTimeout *durationpb.Duration `protobuf:"bytes,2,opt,name=execution_timeout,json=executionTimeout,proto3" json:"execution_timeout,omitempty"`
 }
 
 func (x *NodeInitializationAction) Reset() {
@@ -1982,7 +1982,7 @@ func (x *NodeInitializationAction) GetExecutableFile() string {
 	return ""
 }
 
-func (x *NodeInitializationAction) GetExecutionTimeout() *duration.Duration {
+func (x *NodeInitializationAction) GetExecutionTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.ExecutionTimeout
 	}
@@ -2001,7 +2001,7 @@ type ClusterStatus struct {
 	Detail string `protobuf:"bytes,2,opt,name=detail,proto3" json:"detail,omitempty"`
 	// Output only. Time when this state was entered (see JSON representation of
 	// [Timestamp](https://developers.google.com/protocol-buffers/docs/proto3#json)).
-	StateStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
+	StateStartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
 	// Output only. Additional state information that includes
 	// status reported by the agent.
 	Substate ClusterStatus_Substate `protobuf:"varint,4,opt,name=substate,proto3,enum=google.cloud.dataproc.v1.ClusterStatus_Substate" json:"substate,omitempty"`
@@ -2053,7 +2053,7 @@ func (x *ClusterStatus) GetDetail() string {
 	return ""
 }
 
-func (x *ClusterStatus) GetStateStartTime() *timestamp.Timestamp {
+func (x *ClusterStatus) GetStateStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateStartTime
 	}
@@ -2474,7 +2474,7 @@ type LifecycleConfig struct {
 	// deleted. Minimum value is 5 minutes; maximum value is 14 days (see JSON
 	// representation of
 	// [Duration](https://developers.google.com/protocol-buffers/docs/proto3#json)).
-	IdleDeleteTtl *duration.Duration `protobuf:"bytes,1,opt,name=idle_delete_ttl,json=idleDeleteTtl,proto3" json:"idle_delete_ttl,omitempty"`
+	IdleDeleteTtl *durationpb.Duration `protobuf:"bytes,1,opt,name=idle_delete_ttl,json=idleDeleteTtl,proto3" json:"idle_delete_ttl,omitempty"`
 	// Either the exact time the cluster should be deleted at or
 	// the cluster maximum age.
 	//
@@ -2487,7 +2487,7 @@ type LifecycleConfig struct {
 	// and became eligible for deletion due to idleness (see JSON representation
 	// of
 	// [Timestamp](https://developers.google.com/protocol-buffers/docs/proto3#json)).
-	IdleStartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=idle_start_time,json=idleStartTime,proto3" json:"idle_start_time,omitempty"`
+	IdleStartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=idle_start_time,json=idleStartTime,proto3" json:"idle_start_time,omitempty"`
 }
 
 func (x *LifecycleConfig) Reset() {
@@ -2522,7 +2522,7 @@ func (*LifecycleConfig) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dataproc_v1_clusters_proto_rawDescGZIP(), []int{21}
 }
 
-func (x *LifecycleConfig) GetIdleDeleteTtl() *duration.Duration {
+func (x *LifecycleConfig) GetIdleDeleteTtl() *durationpb.Duration {
 	if x != nil {
 		return x.IdleDeleteTtl
 	}
@@ -2536,21 +2536,21 @@ func (m *LifecycleConfig) GetTtl() isLifecycleConfig_Ttl {
 	return nil
 }
 
-func (x *LifecycleConfig) GetAutoDeleteTime() *timestamp.Timestamp {
+func (x *LifecycleConfig) GetAutoDeleteTime() *timestamppb.Timestamp {
 	if x, ok := x.GetTtl().(*LifecycleConfig_AutoDeleteTime); ok {
 		return x.AutoDeleteTime
 	}
 	return nil
 }
 
-func (x *LifecycleConfig) GetAutoDeleteTtl() *duration.Duration {
+func (x *LifecycleConfig) GetAutoDeleteTtl() *durationpb.Duration {
 	if x, ok := x.GetTtl().(*LifecycleConfig_AutoDeleteTtl); ok {
 		return x.AutoDeleteTtl
 	}
 	return nil
 }
 
-func (x *LifecycleConfig) GetIdleStartTime() *timestamp.Timestamp {
+func (x *LifecycleConfig) GetIdleStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.IdleStartTime
 	}
@@ -2564,7 +2564,7 @@ type isLifecycleConfig_Ttl interface {
 type LifecycleConfig_AutoDeleteTime struct {
 	// Optional. The time when cluster will be auto-deleted (see JSON representation of
 	// [Timestamp](https://developers.google.com/protocol-buffers/docs/proto3#json)).
-	AutoDeleteTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=auto_delete_time,json=autoDeleteTime,proto3,oneof"`
+	AutoDeleteTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=auto_delete_time,json=autoDeleteTime,proto3,oneof"`
 }
 
 type LifecycleConfig_AutoDeleteTtl struct {
@@ -2572,7 +2572,7 @@ type LifecycleConfig_AutoDeleteTtl struct {
 	// auto-deleted at the end of this period. Minimum value is 10 minutes;
 	// maximum value is 14 days (see JSON representation of
 	// [Duration](https://developers.google.com/protocol-buffers/docs/proto3#json)).
-	AutoDeleteTtl *duration.Duration `protobuf:"bytes,3,opt,name=auto_delete_ttl,json=autoDeleteTtl,proto3,oneof"`
+	AutoDeleteTtl *durationpb.Duration `protobuf:"bytes,3,opt,name=auto_delete_ttl,json=autoDeleteTtl,proto3,oneof"`
 }
 
 func (*LifecycleConfig_AutoDeleteTime) isLifecycleConfig_Ttl() {}
@@ -2862,7 +2862,7 @@ type UpdateClusterRequest struct {
 	// [Duration](https://developers.google.com/protocol-buffers/docs/proto3#json)).
 	//
 	// Only supported on Dataproc image versions 1.2 and higher.
-	GracefulDecommissionTimeout *duration.Duration `protobuf:"bytes,6,opt,name=graceful_decommission_timeout,json=gracefulDecommissionTimeout,proto3" json:"graceful_decommission_timeout,omitempty"`
+	GracefulDecommissionTimeout *durationpb.Duration `protobuf:"bytes,6,opt,name=graceful_decommission_timeout,json=gracefulDecommissionTimeout,proto3" json:"graceful_decommission_timeout,omitempty"`
 	// Required. Specifies the path, relative to `Cluster`, of
 	// the field to update. For example, to change the number of workers
 	// in a cluster to 5, the `update_mask` parameter would be
@@ -2916,7 +2916,7 @@ type UpdateClusterRequest struct {
 	//	</tr>
 	//	</tbody>
 	//	</table>
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. A unique ID used to identify the request. If the server
 	// receives two
 	// [UpdateClusterRequest](https://cloud.google.com/dataproc/docs/reference/rpc/google.cloud.dataproc.v1#google.cloud.dataproc.v1.UpdateClusterRequest)s
@@ -2992,14 +2992,14 @@ func (x *UpdateClusterRequest) GetCluster() *Cluster {
 	return nil
 }
 
-func (x *UpdateClusterRequest) GetGracefulDecommissionTimeout() *duration.Duration {
+func (x *UpdateClusterRequest) GetGracefulDecommissionTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.GracefulDecommissionTimeout
 	}
 	return nil
 }
 
-func (x *UpdateClusterRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateClusterRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -4771,11 +4771,11 @@ var file_google_cloud_dataproc_v1_clusters_proto_goTypes = []interface{}{
 	nil,                                           // 49: google.cloud.dataproc.v1.ClusterMetrics.YarnMetricsEntry
 	(*KubernetesClusterConfig)(nil),               // 50: google.cloud.dataproc.v1.KubernetesClusterConfig
 	(*SparkHistoryServerConfig)(nil),              // 51: google.cloud.dataproc.v1.SparkHistoryServerConfig
-	(*duration.Duration)(nil),                     // 52: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),                   // 53: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                   // 52: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                 // 53: google.protobuf.Timestamp
 	(Component)(0),                                // 54: google.cloud.dataproc.v1.Component
 	(FailureAction)(0),                            // 55: google.cloud.dataproc.v1.FailureAction
-	(*field_mask.FieldMask)(nil),                  // 56: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                 // 56: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),                 // 57: google.longrunning.Operation
 }
 var file_google_cloud_dataproc_v1_clusters_proto_depIdxs = []int32{
diff --git a/dataproc/apiv1/dataprocpb/jobs.pb.go b/dataproc/apiv1/dataprocpb/jobs.pb.go
index bf4ebe25af0..8952beb5437 100644
--- a/dataproc/apiv1/dataprocpb/jobs.pb.go
+++ b/dataproc/apiv1/dataprocpb/jobs.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataproc/v1/jobs.proto
 
 package dataprocpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1693,7 +1693,7 @@ type JobStatus struct {
 	// description if the state is <code>ERROR</code>.
 	Details string `protobuf:"bytes,2,opt,name=details,proto3" json:"details,omitempty"`
 	// Output only. The time when this state was entered.
-	StateStartTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
+	StateStartTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
 	// Output only. Additional state information, which includes
 	// status reported by the agent.
 	Substate JobStatus_Substate `protobuf:"varint,7,opt,name=substate,proto3,enum=google.cloud.dataproc.v1.JobStatus_Substate" json:"substate,omitempty"`
@@ -1745,7 +1745,7 @@ func (x *JobStatus) GetDetails() string {
 	return ""
 }
 
-func (x *JobStatus) GetStateStartTime() *timestamp.Timestamp {
+func (x *JobStatus) GetStateStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateStartTime
 	}
@@ -2384,7 +2384,7 @@ type JobMetadata struct {
 	// Output only. Operation type.
 	OperationType string `protobuf:"bytes,3,opt,name=operation_type,json=operationType,proto3" json:"operation_type,omitempty"`
 	// Output only. Job submission time.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 }
 
 func (x *JobMetadata) Reset() {
@@ -2440,7 +2440,7 @@ func (x *JobMetadata) GetOperationType() string {
 	return ""
 }
 
-func (x *JobMetadata) GetStartTime() *timestamp.Timestamp {
+func (x *JobMetadata) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -2658,7 +2658,7 @@ type UpdateJobRequest struct {
 	// <code>labels</code>, and the `PATCH` request body would specify the new
 	// value. <strong>Note:</strong> Currently, <code>labels</code> is the only
 	// field that can be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateJobRequest) Reset() {
@@ -2721,7 +2721,7 @@ func (x *UpdateJobRequest) GetJob() *Job {
 	return nil
 }
 
-func (x *UpdateJobRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateJobRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3645,10 +3645,10 @@ var file_google_cloud_dataproc_v1_jobs_proto_goTypes = []interface{}{
 	nil,                                  // 40: google.cloud.dataproc.v1.PrestoJob.PropertiesEntry
 	nil,                                  // 41: google.cloud.dataproc.v1.JobPlacement.ClusterLabelsEntry
 	nil,                                  // 42: google.cloud.dataproc.v1.Job.LabelsEntry
-	(*timestamp.Timestamp)(nil),          // 43: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),         // 44: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),        // 43: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),        // 44: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),        // 45: google.longrunning.Operation
-	(*empty.Empty)(nil),                  // 46: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                // 46: google.protobuf.Empty
 }
 var file_google_cloud_dataproc_v1_jobs_proto_depIdxs = []int32{
 	29, // 0: google.cloud.dataproc.v1.LoggingConfig.driver_log_levels:type_name -> google.cloud.dataproc.v1.LoggingConfig.DriverLogLevelsEntry
@@ -4103,7 +4103,7 @@ type JobControllerClient interface {
 	CancelJob(ctx context.Context, in *CancelJobRequest, opts ...grpc.CallOption) (*Job, error)
 	// Deletes the job from the project. If the job is active, the delete fails,
 	// and the response returns `FAILED_PRECONDITION`.
-	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type jobControllerClient struct {
@@ -4168,8 +4168,8 @@ func (c *jobControllerClient) CancelJob(ctx context.Context, in *CancelJobReques
 	return out, nil
 }
 
-func (c *jobControllerClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *jobControllerClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.JobController/DeleteJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -4197,7 +4197,7 @@ type JobControllerServer interface {
 	CancelJob(context.Context, *CancelJobRequest) (*Job, error)
 	// Deletes the job from the project. If the job is active, the delete fails,
 	// and the response returns `FAILED_PRECONDITION`.
-	DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error)
+	DeleteJob(context.Context, *DeleteJobRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedJobControllerServer can be embedded to have forward compatible implementations.
@@ -4222,7 +4222,7 @@ func (*UnimplementedJobControllerServer) UpdateJob(context.Context, *UpdateJobRe
 func (*UnimplementedJobControllerServer) CancelJob(context.Context, *CancelJobRequest) (*Job, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CancelJob not implemented")
 }
-func (*UnimplementedJobControllerServer) DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error) {
+func (*UnimplementedJobControllerServer) DeleteJob(context.Context, *DeleteJobRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteJob not implemented")
 }
 
diff --git a/dataproc/apiv1/dataprocpb/operations.pb.go b/dataproc/apiv1/dataprocpb/operations.pb.go
index 5d74033af21..b8bcecd2265 100644
--- a/dataproc/apiv1/dataprocpb/operations.pb.go
+++ b/dataproc/apiv1/dataprocpb/operations.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataproc/v1/operations.proto
 
 package dataprocpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -154,9 +154,9 @@ type BatchOperationMetadata struct {
 	// Batch UUID for the operation.
 	BatchUuid string `protobuf:"bytes,2,opt,name=batch_uuid,json=batchUuid,proto3" json:"batch_uuid,omitempty"`
 	// The time when the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time when the operation finished.
-	DoneTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=done_time,json=doneTime,proto3" json:"done_time,omitempty"`
+	DoneTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=done_time,json=doneTime,proto3" json:"done_time,omitempty"`
 	// The operation type.
 	OperationType BatchOperationMetadata_BatchOperationType `protobuf:"varint,6,opt,name=operation_type,json=operationType,proto3,enum=google.cloud.dataproc.v1.BatchOperationMetadata_BatchOperationType" json:"operation_type,omitempty"`
 	// Short description of the operation.
@@ -213,14 +213,14 @@ func (x *BatchOperationMetadata) GetBatchUuid() string {
 	return ""
 }
 
-func (x *BatchOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *BatchOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *BatchOperationMetadata) GetDoneTime() *timestamp.Timestamp {
+func (x *BatchOperationMetadata) GetDoneTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DoneTime
 	}
@@ -268,7 +268,7 @@ type ClusterOperationStatus struct {
 	// Output only. A message containing any operation metadata details.
 	Details string `protobuf:"bytes,3,opt,name=details,proto3" json:"details,omitempty"`
 	// Output only. The time this state was entered.
-	StateStartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
+	StateStartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=state_start_time,json=stateStartTime,proto3" json:"state_start_time,omitempty"`
 }
 
 func (x *ClusterOperationStatus) Reset() {
@@ -324,7 +324,7 @@ func (x *ClusterOperationStatus) GetDetails() string {
 	return ""
 }
 
-func (x *ClusterOperationStatus) GetStateStartTime() *timestamp.Timestamp {
+func (x *ClusterOperationStatus) GetStateStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateStartTime
 	}
@@ -577,7 +577,7 @@ var file_google_cloud_dataproc_v1_operations_proto_goTypes = []interface{}{
 	(*ClusterOperationMetadata)(nil),               // 4: google.cloud.dataproc.v1.ClusterOperationMetadata
 	nil,                                            // 5: google.cloud.dataproc.v1.BatchOperationMetadata.LabelsEntry
 	nil,                                            // 6: google.cloud.dataproc.v1.ClusterOperationMetadata.LabelsEntry
-	(*timestamp.Timestamp)(nil),                    // 7: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                  // 7: google.protobuf.Timestamp
 }
 var file_google_cloud_dataproc_v1_operations_proto_depIdxs = []int32{
 	7, // 0: google.cloud.dataproc.v1.BatchOperationMetadata.create_time:type_name -> google.protobuf.Timestamp
diff --git a/dataproc/apiv1/dataprocpb/shared.pb.go b/dataproc/apiv1/dataprocpb/shared.pb.go
index 0072171de85..1cb5ab549ed 100644
--- a/dataproc/apiv1/dataprocpb/shared.pb.go
+++ b/dataproc/apiv1/dataprocpb/shared.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataproc/v1/shared.proto
 
 package dataprocpb
diff --git a/dataproc/apiv1/dataprocpb/workflow_templates.pb.go b/dataproc/apiv1/dataprocpb/workflow_templates.pb.go
index 60a16c7a24a..758b452cc57 100644
--- a/dataproc/apiv1/dataprocpb/workflow_templates.pb.go
+++ b/dataproc/apiv1/dataprocpb/workflow_templates.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dataproc/v1/workflow_templates.proto
 
 package dataprocpb
@@ -25,9 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -35,6 +32,9 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -196,9 +196,9 @@ type WorkflowTemplate struct {
 	// then returns it as part of the `UpdateWorkflowTemplate` request.
 	Version int32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
 	// Output only. The time template was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time template was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. The labels to associate with this template. These labels
 	// will be propagated to all jobs and clusters created by the workflow
 	// instance.
@@ -230,7 +230,7 @@ type WorkflowTemplate struct {
 	// [managed
 	// cluster](/dataproc/docs/concepts/workflows/using-workflows#configuring_or_selecting_a_cluster),
 	// the cluster is deleted.
-	DagTimeout *duration.Duration `protobuf:"bytes,10,opt,name=dag_timeout,json=dagTimeout,proto3" json:"dag_timeout,omitempty"`
+	DagTimeout *durationpb.Duration `protobuf:"bytes,10,opt,name=dag_timeout,json=dagTimeout,proto3" json:"dag_timeout,omitempty"`
 }
 
 func (x *WorkflowTemplate) Reset() {
@@ -286,14 +286,14 @@ func (x *WorkflowTemplate) GetVersion() int32 {
 	return 0
 }
 
-func (x *WorkflowTemplate) GetCreateTime() *timestamp.Timestamp {
+func (x *WorkflowTemplate) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *WorkflowTemplate) GetUpdateTime() *timestamp.Timestamp {
+func (x *WorkflowTemplate) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -328,7 +328,7 @@ func (x *WorkflowTemplate) GetParameters() []*TemplateParameter {
 	return nil
 }
 
-func (x *WorkflowTemplate) GetDagTimeout() *duration.Duration {
+func (x *WorkflowTemplate) GetDagTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.DagTimeout
 	}
@@ -1156,20 +1156,20 @@ type WorkflowMetadata struct {
 	// Map from parameter names to values that were used for those parameters.
 	Parameters map[string]string `protobuf:"bytes,8,rep,name=parameters,proto3" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. Workflow start time.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. Workflow end time.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The UUID of target cluster.
 	ClusterUuid string `protobuf:"bytes,11,opt,name=cluster_uuid,json=clusterUuid,proto3" json:"cluster_uuid,omitempty"`
 	// Output only. The timeout duration for the DAG of jobs, expressed in seconds (see
 	// [JSON representation of
 	// duration](https://developers.google.com/protocol-buffers/docs/proto3#json)).
-	DagTimeout *duration.Duration `protobuf:"bytes,12,opt,name=dag_timeout,json=dagTimeout,proto3" json:"dag_timeout,omitempty"`
+	DagTimeout *durationpb.Duration `protobuf:"bytes,12,opt,name=dag_timeout,json=dagTimeout,proto3" json:"dag_timeout,omitempty"`
 	// Output only. DAG start time, only set for workflows with [dag_timeout][google.cloud.dataproc.v1.WorkflowMetadata.dag_timeout] when DAG
 	// begins.
-	DagStartTime *timestamp.Timestamp `protobuf:"bytes,13,opt,name=dag_start_time,json=dagStartTime,proto3" json:"dag_start_time,omitempty"`
+	DagStartTime *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=dag_start_time,json=dagStartTime,proto3" json:"dag_start_time,omitempty"`
 	// Output only. DAG end time, only set for workflows with [dag_timeout][google.cloud.dataproc.v1.WorkflowMetadata.dag_timeout] when DAG ends.
-	DagEndTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=dag_end_time,json=dagEndTime,proto3" json:"dag_end_time,omitempty"`
+	DagEndTime *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=dag_end_time,json=dagEndTime,proto3" json:"dag_end_time,omitempty"`
 }
 
 func (x *WorkflowMetadata) Reset() {
@@ -1260,14 +1260,14 @@ func (x *WorkflowMetadata) GetParameters() map[string]string {
 	return nil
 }
 
-func (x *WorkflowMetadata) GetStartTime() *timestamp.Timestamp {
+func (x *WorkflowMetadata) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *WorkflowMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *WorkflowMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1281,21 +1281,21 @@ func (x *WorkflowMetadata) GetClusterUuid() string {
 	return ""
 }
 
-func (x *WorkflowMetadata) GetDagTimeout() *duration.Duration {
+func (x *WorkflowMetadata) GetDagTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.DagTimeout
 	}
 	return nil
 }
 
-func (x *WorkflowMetadata) GetDagStartTime() *timestamp.Timestamp {
+func (x *WorkflowMetadata) GetDagStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DagStartTime
 	}
 	return nil
 }
 
-func (x *WorkflowMetadata) GetDagEndTime() *timestamp.Timestamp {
+func (x *WorkflowMetadata) GetDagEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DagEndTime
 	}
@@ -2678,8 +2678,8 @@ var file_google_cloud_dataproc_v1_workflow_templates_proto_goTypes = []interface
 	nil,                                              // 26: google.cloud.dataproc.v1.OrderedJob.LabelsEntry
 	nil,                                              // 27: google.cloud.dataproc.v1.WorkflowMetadata.ParametersEntry
 	nil,                                              // 28: google.cloud.dataproc.v1.InstantiateWorkflowTemplateRequest.ParametersEntry
-	(*timestamp.Timestamp)(nil),                      // 29: google.protobuf.Timestamp
-	(*duration.Duration)(nil),                        // 30: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                    // 29: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                      // 30: google.protobuf.Duration
 	(*ClusterConfig)(nil),                            // 31: google.cloud.dataproc.v1.ClusterConfig
 	(*HadoopJob)(nil),                                // 32: google.cloud.dataproc.v1.HadoopJob
 	(*SparkJob)(nil),                                 // 33: google.cloud.dataproc.v1.SparkJob
@@ -2691,7 +2691,7 @@ var file_google_cloud_dataproc_v1_workflow_templates_proto_goTypes = []interface
 	(*PrestoJob)(nil),                                // 39: google.cloud.dataproc.v1.PrestoJob
 	(*JobScheduling)(nil),                            // 40: google.cloud.dataproc.v1.JobScheduling
 	(*longrunning.Operation)(nil),                    // 41: google.longrunning.Operation
-	(*empty.Empty)(nil),                              // 42: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                            // 42: google.protobuf.Empty
 }
 var file_google_cloud_dataproc_v1_workflow_templates_proto_depIdxs = []int32{
 	29, // 0: google.cloud.dataproc.v1.WorkflowTemplate.create_time:type_name -> google.protobuf.Timestamp
@@ -3128,7 +3128,7 @@ type WorkflowTemplateServiceClient interface {
 	// Lists workflows that match the specified filter in the request.
 	ListWorkflowTemplates(ctx context.Context, in *ListWorkflowTemplatesRequest, opts ...grpc.CallOption) (*ListWorkflowTemplatesResponse, error)
 	// Deletes a workflow template. It does not cancel in-progress workflows.
-	DeleteWorkflowTemplate(ctx context.Context, in *DeleteWorkflowTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteWorkflowTemplate(ctx context.Context, in *DeleteWorkflowTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type workflowTemplateServiceClient struct {
@@ -3193,8 +3193,8 @@ func (c *workflowTemplateServiceClient) ListWorkflowTemplates(ctx context.Contex
 	return out, nil
 }
 
-func (c *workflowTemplateServiceClient) DeleteWorkflowTemplate(ctx context.Context, in *DeleteWorkflowTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *workflowTemplateServiceClient) DeleteWorkflowTemplate(ctx context.Context, in *DeleteWorkflowTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dataproc.v1.WorkflowTemplateService/DeleteWorkflowTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3263,7 +3263,7 @@ type WorkflowTemplateServiceServer interface {
 	// Lists workflows that match the specified filter in the request.
 	ListWorkflowTemplates(context.Context, *ListWorkflowTemplatesRequest) (*ListWorkflowTemplatesResponse, error)
 	// Deletes a workflow template. It does not cancel in-progress workflows.
-	DeleteWorkflowTemplate(context.Context, *DeleteWorkflowTemplateRequest) (*empty.Empty, error)
+	DeleteWorkflowTemplate(context.Context, *DeleteWorkflowTemplateRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedWorkflowTemplateServiceServer can be embedded to have forward compatible implementations.
@@ -3288,7 +3288,7 @@ func (*UnimplementedWorkflowTemplateServiceServer) UpdateWorkflowTemplate(contex
 func (*UnimplementedWorkflowTemplateServiceServer) ListWorkflowTemplates(context.Context, *ListWorkflowTemplatesRequest) (*ListWorkflowTemplatesResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListWorkflowTemplates not implemented")
 }
-func (*UnimplementedWorkflowTemplateServiceServer) DeleteWorkflowTemplate(context.Context, *DeleteWorkflowTemplateRequest) (*empty.Empty, error) {
+func (*UnimplementedWorkflowTemplateServiceServer) DeleteWorkflowTemplate(context.Context, *DeleteWorkflowTemplateRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteWorkflowTemplate not implemented")
 }
 
diff --git a/dataproc/apiv1/doc.go b/dataproc/apiv1/doc.go
index 34c99016c83..07728120628 100644
--- a/dataproc/apiv1/doc.go
+++ b/dataproc/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &dataprocpb.CreateAutoscalingPolicyRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateAutoscalingPolicyRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateAutoscalingPolicyRequest.
 //	}
 //	resp, err := c.CreateAutoscalingPolicy(ctx, req)
 //	if err != nil {
diff --git a/dataproc/apiv1/job_controller_client.go b/dataproc/apiv1/job_controller_client.go
index a51a0442ad4..adfd7ef91b9 100644
--- a/dataproc/apiv1/job_controller_client.go
+++ b/dataproc/apiv1/job_controller_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/dataproc/apiv1/job_controller_client_example_test.go b/dataproc/apiv1/job_controller_client_example_test.go
index c174a3739b1..da8df069b47 100644
--- a/dataproc/apiv1/job_controller_client_example_test.go
+++ b/dataproc/apiv1/job_controller_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func ExampleNewJobControllerClient() {
@@ -56,7 +56,7 @@ func ExampleJobControllerClient_SubmitJob() {
 
 	req := &dataprocpb.SubmitJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#SubmitJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#SubmitJobRequest.
 	}
 	resp, err := c.SubmitJob(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleJobControllerClient_SubmitJobAsOperation() {
 
 	req := &dataprocpb.SubmitJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#SubmitJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#SubmitJobRequest.
 	}
 	op, err := c.SubmitJobAsOperation(ctx, req)
 	if err != nil {
@@ -111,7 +111,7 @@ func ExampleJobControllerClient_GetJob() {
 
 	req := &dataprocpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
@@ -136,7 +136,7 @@ func ExampleJobControllerClient_ListJobs() {
 
 	req := &dataprocpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
@@ -167,7 +167,7 @@ func ExampleJobControllerClient_UpdateJob() {
 
 	req := &dataprocpb.UpdateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#UpdateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#UpdateJobRequest.
 	}
 	resp, err := c.UpdateJob(ctx, req)
 	if err != nil {
@@ -192,7 +192,7 @@ func ExampleJobControllerClient_CancelJob() {
 
 	req := &dataprocpb.CancelJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CancelJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CancelJobRequest.
 	}
 	resp, err := c.CancelJob(ctx, req)
 	if err != nil {
@@ -217,7 +217,7 @@ func ExampleJobControllerClient_DeleteJob() {
 
 	req := &dataprocpb.DeleteJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteJobRequest.
 	}
 	err = c.DeleteJob(ctx, req)
 	if err != nil {
diff --git a/dataproc/apiv1/workflow_template_client.go b/dataproc/apiv1/workflow_template_client.go
index dac40697ee1..68ca178cbbc 100644
--- a/dataproc/apiv1/workflow_template_client.go
+++ b/dataproc/apiv1/workflow_template_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/dataproc/apiv1/workflow_template_client_example_test.go b/dataproc/apiv1/workflow_template_client_example_test.go
index ea2e1dc4c6f..2431377056b 100644
--- a/dataproc/apiv1/workflow_template_client_example_test.go
+++ b/dataproc/apiv1/workflow_template_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func ExampleNewWorkflowTemplateClient() {
@@ -56,7 +56,7 @@ func ExampleWorkflowTemplateClient_CreateWorkflowTemplate() {
 
 	req := &dataprocpb.CreateWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateWorkflowTemplateRequest.
 	}
 	resp, err := c.CreateWorkflowTemplate(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleWorkflowTemplateClient_GetWorkflowTemplate() {
 
 	req := &dataprocpb.GetWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetWorkflowTemplateRequest.
 	}
 	resp, err := c.GetWorkflowTemplate(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleWorkflowTemplateClient_InstantiateWorkflowTemplate() {
 
 	req := &dataprocpb.InstantiateWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#InstantiateWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#InstantiateWorkflowTemplateRequest.
 	}
 	op, err := c.InstantiateWorkflowTemplate(ctx, req)
 	if err != nil {
@@ -134,7 +134,7 @@ func ExampleWorkflowTemplateClient_InstantiateInlineWorkflowTemplate() {
 
 	req := &dataprocpb.InstantiateInlineWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#InstantiateInlineWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#InstantiateInlineWorkflowTemplateRequest.
 	}
 	op, err := c.InstantiateInlineWorkflowTemplate(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleWorkflowTemplateClient_UpdateWorkflowTemplate() {
 
 	req := &dataprocpb.UpdateWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#UpdateWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#UpdateWorkflowTemplateRequest.
 	}
 	resp, err := c.UpdateWorkflowTemplate(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleWorkflowTemplateClient_ListWorkflowTemplates() {
 
 	req := &dataprocpb.ListWorkflowTemplatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListWorkflowTemplatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListWorkflowTemplatesRequest.
 	}
 	it := c.ListWorkflowTemplates(ctx, req)
 	for {
@@ -218,7 +218,7 @@ func ExampleWorkflowTemplateClient_DeleteWorkflowTemplate() {
 
 	req := &dataprocpb.DeleteWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteWorkflowTemplateRequest.
 	}
 	err = c.DeleteWorkflowTemplate(ctx, req)
 	if err != nil {
diff --git a/dataproc/go.mod b/dataproc/go.mod
index 688bcbfb069..7c023d20dc2 100644
--- a/dataproc/go.mod
+++ b/dataproc/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/dataproc
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/dataproc/go.sum b/dataproc/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/dataproc/go.sum
+++ b/dataproc/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/datastream/apiv1/datastream_client.go b/datastream/apiv1/datastream_client.go
index 25a7df272c1..f13e6b7d868 100644
--- a/datastream/apiv1/datastream_client.go
+++ b/datastream/apiv1/datastream_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/datastream/apiv1/datastream_client_example_test.go b/datastream/apiv1/datastream_client_example_test.go
index 3da9742eb52..6ac84ddafc2 100644
--- a/datastream/apiv1/datastream_client_example_test.go
+++ b/datastream/apiv1/datastream_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 	"google.golang.org/api/iterator"
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleClient_ListConnectionProfiles() {
 
 	req := &datastreampb.ListConnectionProfilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListConnectionProfilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListConnectionProfilesRequest.
 	}
 	it := c.ListConnectionProfiles(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleClient_GetConnectionProfile() {
 
 	req := &datastreampb.GetConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetConnectionProfileRequest.
 	}
 	resp, err := c.GetConnectionProfile(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleClient_CreateConnectionProfile() {
 
 	req := &datastreampb.CreateConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#CreateConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#CreateConnectionProfileRequest.
 	}
 	op, err := c.CreateConnectionProfile(ctx, req)
 	if err != nil {
@@ -144,7 +144,7 @@ func ExampleClient_UpdateConnectionProfile() {
 
 	req := &datastreampb.UpdateConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#UpdateConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#UpdateConnectionProfileRequest.
 	}
 	op, err := c.UpdateConnectionProfile(ctx, req)
 	if err != nil {
@@ -174,7 +174,7 @@ func ExampleClient_DeleteConnectionProfile() {
 
 	req := &datastreampb.DeleteConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DeleteConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DeleteConnectionProfileRequest.
 	}
 	op, err := c.DeleteConnectionProfile(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleClient_DiscoverConnectionProfile() {
 
 	req := &datastreampb.DiscoverConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DiscoverConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DiscoverConnectionProfileRequest.
 	}
 	resp, err := c.DiscoverConnectionProfile(ctx, req)
 	if err != nil {
@@ -227,7 +227,7 @@ func ExampleClient_ListStreams() {
 
 	req := &datastreampb.ListStreamsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListStreamsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListStreamsRequest.
 	}
 	it := c.ListStreams(ctx, req)
 	for {
@@ -258,7 +258,7 @@ func ExampleClient_GetStream() {
 
 	req := &datastreampb.GetStreamRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetStreamRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetStreamRequest.
 	}
 	resp, err := c.GetStream(ctx, req)
 	if err != nil {
@@ -283,7 +283,7 @@ func ExampleClient_CreateStream() {
 
 	req := &datastreampb.CreateStreamRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#CreateStreamRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#CreateStreamRequest.
 	}
 	op, err := c.CreateStream(ctx, req)
 	if err != nil {
@@ -313,7 +313,7 @@ func ExampleClient_UpdateStream() {
 
 	req := &datastreampb.UpdateStreamRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#UpdateStreamRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#UpdateStreamRequest.
 	}
 	op, err := c.UpdateStream(ctx, req)
 	if err != nil {
@@ -343,7 +343,7 @@ func ExampleClient_DeleteStream() {
 
 	req := &datastreampb.DeleteStreamRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DeleteStreamRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DeleteStreamRequest.
 	}
 	op, err := c.DeleteStream(ctx, req)
 	if err != nil {
@@ -371,7 +371,7 @@ func ExampleClient_GetStreamObject() {
 
 	req := &datastreampb.GetStreamObjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetStreamObjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetStreamObjectRequest.
 	}
 	resp, err := c.GetStreamObject(ctx, req)
 	if err != nil {
@@ -396,7 +396,7 @@ func ExampleClient_LookupStreamObject() {
 
 	req := &datastreampb.LookupStreamObjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#LookupStreamObjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#LookupStreamObjectRequest.
 	}
 	resp, err := c.LookupStreamObject(ctx, req)
 	if err != nil {
@@ -421,7 +421,7 @@ func ExampleClient_ListStreamObjects() {
 
 	req := &datastreampb.ListStreamObjectsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListStreamObjectsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListStreamObjectsRequest.
 	}
 	it := c.ListStreamObjects(ctx, req)
 	for {
@@ -452,7 +452,7 @@ func ExampleClient_StartBackfillJob() {
 
 	req := &datastreampb.StartBackfillJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#StartBackfillJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#StartBackfillJobRequest.
 	}
 	resp, err := c.StartBackfillJob(ctx, req)
 	if err != nil {
@@ -477,7 +477,7 @@ func ExampleClient_StopBackfillJob() {
 
 	req := &datastreampb.StopBackfillJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#StopBackfillJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#StopBackfillJobRequest.
 	}
 	resp, err := c.StopBackfillJob(ctx, req)
 	if err != nil {
@@ -502,7 +502,7 @@ func ExampleClient_FetchStaticIps() {
 
 	req := &datastreampb.FetchStaticIpsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#FetchStaticIpsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#FetchStaticIpsRequest.
 	}
 	it := c.FetchStaticIps(ctx, req)
 	for {
@@ -533,7 +533,7 @@ func ExampleClient_CreatePrivateConnection() {
 
 	req := &datastreampb.CreatePrivateConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#CreatePrivateConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#CreatePrivateConnectionRequest.
 	}
 	op, err := c.CreatePrivateConnection(ctx, req)
 	if err != nil {
@@ -563,7 +563,7 @@ func ExampleClient_GetPrivateConnection() {
 
 	req := &datastreampb.GetPrivateConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetPrivateConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetPrivateConnectionRequest.
 	}
 	resp, err := c.GetPrivateConnection(ctx, req)
 	if err != nil {
@@ -588,7 +588,7 @@ func ExampleClient_ListPrivateConnections() {
 
 	req := &datastreampb.ListPrivateConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListPrivateConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListPrivateConnectionsRequest.
 	}
 	it := c.ListPrivateConnections(ctx, req)
 	for {
@@ -619,7 +619,7 @@ func ExampleClient_DeletePrivateConnection() {
 
 	req := &datastreampb.DeletePrivateConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DeletePrivateConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DeletePrivateConnectionRequest.
 	}
 	op, err := c.DeletePrivateConnection(ctx, req)
 	if err != nil {
@@ -647,7 +647,7 @@ func ExampleClient_CreateRoute() {
 
 	req := &datastreampb.CreateRouteRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#CreateRouteRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#CreateRouteRequest.
 	}
 	op, err := c.CreateRoute(ctx, req)
 	if err != nil {
@@ -677,7 +677,7 @@ func ExampleClient_GetRoute() {
 
 	req := &datastreampb.GetRouteRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetRouteRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetRouteRequest.
 	}
 	resp, err := c.GetRoute(ctx, req)
 	if err != nil {
@@ -702,7 +702,7 @@ func ExampleClient_ListRoutes() {
 
 	req := &datastreampb.ListRoutesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListRoutesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListRoutesRequest.
 	}
 	it := c.ListRoutes(ctx, req)
 	for {
@@ -733,7 +733,7 @@ func ExampleClient_DeleteRoute() {
 
 	req := &datastreampb.DeleteRouteRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DeleteRouteRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DeleteRouteRequest.
 	}
 	op, err := c.DeleteRoute(ctx, req)
 	if err != nil {
diff --git a/datastream/apiv1/datastreampb/datastream.pb.go b/datastream/apiv1/datastreampb/datastream.pb.go
index be59260ecae..378b10b56c6 100644
--- a/datastream/apiv1/datastreampb/datastream.pb.go
+++ b/datastream/apiv1/datastreampb/datastream.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datastream/v1/datastream.proto
 
 package datastreampb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -811,7 +811,7 @@ type UpdateConnectionProfileRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The connection profile to update.
 	ConnectionProfile *ConnectionProfile `protobuf:"bytes,2,opt,name=connection_profile,json=connectionProfile,proto3" json:"connection_profile,omitempty"`
 	// Optional. A request ID to identify requests. Specify a unique request ID
@@ -867,7 +867,7 @@ func (*UpdateConnectionProfileRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_datastream_v1_datastream_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *UpdateConnectionProfileRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateConnectionProfileRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1298,7 +1298,7 @@ type UpdateStreamRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The stream resource to update.
 	Stream *Stream `protobuf:"bytes,2,opt,name=stream,proto3" json:"stream,omitempty"`
 	// Optional. A request ID to identify requests. Specify a unique request ID
@@ -1354,7 +1354,7 @@ func (*UpdateStreamRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_datastream_v1_datastream_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *UpdateStreamRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateStreamRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1902,9 +1902,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -1954,14 +1954,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_datastream_v1_datastream_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -3623,11 +3623,11 @@ var file_google_cloud_datastream_v1_datastream_proto_goTypes = []interface{}{
 	(*OracleRdbms)(nil),                       // 36: google.cloud.datastream.v1.OracleRdbms
 	(*MysqlRdbms)(nil),                        // 37: google.cloud.datastream.v1.MysqlRdbms
 	(*PostgresqlRdbms)(nil),                   // 38: google.cloud.datastream.v1.PostgresqlRdbms
-	(*field_mask.FieldMask)(nil),              // 39: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),             // 39: google.protobuf.FieldMask
 	(*Stream)(nil),                            // 40: google.cloud.datastream.v1.Stream
 	(*SourceObjectIdentifier)(nil),            // 41: google.cloud.datastream.v1.SourceObjectIdentifier
 	(*StreamObject)(nil),                      // 42: google.cloud.datastream.v1.StreamObject
-	(*timestamp.Timestamp)(nil),               // 43: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),             // 43: google.protobuf.Timestamp
 	(*ValidationResult)(nil),                  // 44: google.cloud.datastream.v1.ValidationResult
 	(*PrivateConnection)(nil),                 // 45: google.cloud.datastream.v1.PrivateConnection
 	(*Route)(nil),                             // 46: google.cloud.datastream.v1.Route
diff --git a/datastream/apiv1/datastreampb/datastream_resources.pb.go b/datastream/apiv1/datastreampb/datastream_resources.pb.go
index aa7c84fb327..20b7700d7f1 100644
--- a/datastream/apiv1/datastreampb/datastream_resources.pb.go
+++ b/datastream/apiv1/datastreampb/datastream_resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/datastream/v1/datastream_resources.proto
 
 package datastreampb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1112,9 +1112,9 @@ type PrivateConnection struct {
 	// Output only. The resource's name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The create time of the resource.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time of the resource.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Labels.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. Display name.
@@ -1166,14 +1166,14 @@ func (x *PrivateConnection) GetName() string {
 	return ""
 }
 
-func (x *PrivateConnection) GetCreateTime() *timestamp.Timestamp {
+func (x *PrivateConnection) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *PrivateConnection) GetUpdateTime() *timestamp.Timestamp {
+func (x *PrivateConnection) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1275,9 +1275,9 @@ type Route struct {
 	// Output only. The resource's name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The create time of the resource.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time of the resource.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Labels.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. Display name.
@@ -1327,14 +1327,14 @@ func (x *Route) GetName() string {
 	return ""
 }
 
-func (x *Route) GetCreateTime() *timestamp.Timestamp {
+func (x *Route) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Route) GetUpdateTime() *timestamp.Timestamp {
+func (x *Route) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1478,9 +1478,9 @@ type ConnectionProfile struct {
 	// Output only. The resource's name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The create time of the resource.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time of the resource.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Labels.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. Display name.
@@ -1544,14 +1544,14 @@ func (x *ConnectionProfile) GetName() string {
 	return ""
 }
 
-func (x *ConnectionProfile) GetCreateTime() *timestamp.Timestamp {
+func (x *ConnectionProfile) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ConnectionProfile) GetUpdateTime() *timestamp.Timestamp {
+func (x *ConnectionProfile) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -3024,7 +3024,7 @@ type GcsDestinationConfig struct {
 	FileRotationMb int32 `protobuf:"varint,2,opt,name=file_rotation_mb,json=fileRotationMb,proto3" json:"file_rotation_mb,omitempty"`
 	// The maximum duration for which new events are added before a file is
 	// closed and a new file is created.
-	FileRotationInterval *duration.Duration `protobuf:"bytes,3,opt,name=file_rotation_interval,json=fileRotationInterval,proto3" json:"file_rotation_interval,omitempty"`
+	FileRotationInterval *durationpb.Duration `protobuf:"bytes,3,opt,name=file_rotation_interval,json=fileRotationInterval,proto3" json:"file_rotation_interval,omitempty"`
 	// File Format that the data should be written in.
 	//
 	// Types that are assignable to FileFormat:
@@ -3080,7 +3080,7 @@ func (x *GcsDestinationConfig) GetFileRotationMb() int32 {
 	return 0
 }
 
-func (x *GcsDestinationConfig) GetFileRotationInterval() *duration.Duration {
+func (x *GcsDestinationConfig) GetFileRotationInterval() *durationpb.Duration {
 	if x != nil {
 		return x.FileRotationInterval
 	}
@@ -3142,7 +3142,7 @@ type BigQueryDestinationConfig struct {
 	// the stream. Editing this field will only affect new tables created in the
 	// future, but existing tables will not be impacted. Lower values mean that
 	// queries will return fresher data, but may result in higher cost.
-	DataFreshness *duration.Duration `protobuf:"bytes,300,opt,name=data_freshness,json=dataFreshness,proto3" json:"data_freshness,omitempty"`
+	DataFreshness *durationpb.Duration `protobuf:"bytes,300,opt,name=data_freshness,json=dataFreshness,proto3" json:"data_freshness,omitempty"`
 }
 
 func (x *BigQueryDestinationConfig) Reset() {
@@ -3198,7 +3198,7 @@ func (x *BigQueryDestinationConfig) GetSourceHierarchyDatasets() *BigQueryDestin
 	return nil
 }
 
-func (x *BigQueryDestinationConfig) GetDataFreshness() *duration.Duration {
+func (x *BigQueryDestinationConfig) GetDataFreshness() *durationpb.Duration {
 	if x != nil {
 		return x.DataFreshness
 	}
@@ -3329,9 +3329,9 @@ type Stream struct {
 	// Output only. The stream's name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time of the stream.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update time of the stream.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Labels.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. Display name.
@@ -3397,14 +3397,14 @@ func (x *Stream) GetName() string {
 	return ""
 }
 
-func (x *Stream) GetCreateTime() *timestamp.Timestamp {
+func (x *Stream) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Stream) GetUpdateTime() *timestamp.Timestamp {
+func (x *Stream) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -3509,9 +3509,9 @@ type StreamObject struct {
 	// Output only. The object resource's name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time of the object.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update time of the object.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Required. Display name.
 	DisplayName string `protobuf:"bytes,5,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only. Active errors on the object.
@@ -3561,14 +3561,14 @@ func (x *StreamObject) GetName() string {
 	return ""
 }
 
-func (x *StreamObject) GetCreateTime() *timestamp.Timestamp {
+func (x *StreamObject) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *StreamObject) GetUpdateTime() *timestamp.Timestamp {
+func (x *StreamObject) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -3715,9 +3715,9 @@ type BackfillJob struct {
 	// Backfill job's triggering reason.
 	Trigger BackfillJob_Trigger `protobuf:"varint,2,opt,name=trigger,proto3,enum=google.cloud.datastream.v1.BackfillJob_Trigger" json:"trigger,omitempty"`
 	// Output only. Backfill job's start time.
-	LastStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_start_time,json=lastStartTime,proto3" json:"last_start_time,omitempty"`
+	LastStartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_start_time,json=lastStartTime,proto3" json:"last_start_time,omitempty"`
 	// Output only. Backfill job's end time.
-	LastEndTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_end_time,json=lastEndTime,proto3" json:"last_end_time,omitempty"`
+	LastEndTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_end_time,json=lastEndTime,proto3" json:"last_end_time,omitempty"`
 	// Output only. Errors which caused the backfill job to fail.
 	Errors []*Error `protobuf:"bytes,5,rep,name=errors,proto3" json:"errors,omitempty"`
 }
@@ -3768,14 +3768,14 @@ func (x *BackfillJob) GetTrigger() BackfillJob_Trigger {
 	return BackfillJob_TRIGGER_UNSPECIFIED
 }
 
-func (x *BackfillJob) GetLastStartTime() *timestamp.Timestamp {
+func (x *BackfillJob) GetLastStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastStartTime
 	}
 	return nil
 }
 
-func (x *BackfillJob) GetLastEndTime() *timestamp.Timestamp {
+func (x *BackfillJob) GetLastEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastEndTime
 	}
@@ -3803,7 +3803,7 @@ type Error struct {
 	// A message containing more information about the error that occurred.
 	Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
 	// The time when the error occurred.
-	ErrorTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=error_time,json=errorTime,proto3" json:"error_time,omitempty"`
+	ErrorTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=error_time,json=errorTime,proto3" json:"error_time,omitempty"`
 	// Additional information about the error.
 	Details map[string]string `protobuf:"bytes,5,rep,name=details,proto3" json:"details,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
@@ -3861,7 +3861,7 @@ func (x *Error) GetMessage() string {
 	return ""
 }
 
-func (x *Error) GetErrorTime() *timestamp.Timestamp {
+func (x *Error) GetErrorTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ErrorTime
 	}
@@ -5641,10 +5641,10 @@ var file_google_cloud_datastream_v1_datastream_resources_proto_goTypes = []inter
 	(*SourceObjectIdentifier_OracleObjectIdentifier)(nil),                     // 62: google.cloud.datastream.v1.SourceObjectIdentifier.OracleObjectIdentifier
 	(*SourceObjectIdentifier_PostgresqlObjectIdentifier)(nil),                 // 63: google.cloud.datastream.v1.SourceObjectIdentifier.PostgresqlObjectIdentifier
 	(*SourceObjectIdentifier_MysqlObjectIdentifier)(nil),                      // 64: google.cloud.datastream.v1.SourceObjectIdentifier.MysqlObjectIdentifier
-	nil,                         // 65: google.cloud.datastream.v1.Error.DetailsEntry
-	nil,                         // 66: google.cloud.datastream.v1.ValidationMessage.MetadataEntry
-	(*timestamp.Timestamp)(nil), // 67: google.protobuf.Timestamp
-	(*duration.Duration)(nil),   // 68: google.protobuf.Duration
+	nil,                           // 65: google.cloud.datastream.v1.Error.DetailsEntry
+	nil,                           // 66: google.cloud.datastream.v1.ValidationMessage.MetadataEntry
+	(*timestamppb.Timestamp)(nil), // 67: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),   // 68: google.protobuf.Duration
 }
 var file_google_cloud_datastream_v1_datastream_resources_proto_depIdxs = []int32{
 	50, // 0: google.cloud.datastream.v1.OracleProfile.connection_attributes:type_name -> google.cloud.datastream.v1.OracleProfile.ConnectionAttributesEntry
diff --git a/datastream/apiv1/doc.go b/datastream/apiv1/doc.go
index 7f7a9ec790b..f5fb4c27faa 100644
--- a/datastream/apiv1/doc.go
+++ b/datastream/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &datastreampb.ListConnectionProfilesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListConnectionProfilesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListConnectionProfilesRequest.
 //	}
 //	it := c.ListConnectionProfiles(ctx, req)
 //	for {
diff --git a/datastream/go.mod b/datastream/go.mod
index ed733564148..3afd375b90b 100644
--- a/datastream/go.mod
+++ b/datastream/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/datastream
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/datastream/go.sum b/datastream/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/datastream/go.sum
+++ b/datastream/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/debugger/aliasshim/aliasshim.go b/debugger/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/debugger/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/debugger/apiv2/controller2_client.go b/debugger/apiv2/controller2_client.go
index a22f6e96fd3..fffd91125d4 100644
--- a/debugger/apiv2/controller2_client.go
+++ b/debugger/apiv2/controller2_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	debuggerpb "cloud.google.com/go/debugger/apiv2/debuggerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	clouddebuggerpb "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
@@ -89,9 +89,9 @@ type internalController2Client interface {
 	Close() error
 	setGoogleClientInfo(...string)
 	Connection() *grpc.ClientConn
-	RegisterDebuggee(context.Context, *clouddebuggerpb.RegisterDebuggeeRequest, ...gax.CallOption) (*clouddebuggerpb.RegisterDebuggeeResponse, error)
-	ListActiveBreakpoints(context.Context, *clouddebuggerpb.ListActiveBreakpointsRequest, ...gax.CallOption) (*clouddebuggerpb.ListActiveBreakpointsResponse, error)
-	UpdateActiveBreakpoint(context.Context, *clouddebuggerpb.UpdateActiveBreakpointRequest, ...gax.CallOption) (*clouddebuggerpb.UpdateActiveBreakpointResponse, error)
+	RegisterDebuggee(context.Context, *debuggerpb.RegisterDebuggeeRequest, ...gax.CallOption) (*debuggerpb.RegisterDebuggeeResponse, error)
+	ListActiveBreakpoints(context.Context, *debuggerpb.ListActiveBreakpointsRequest, ...gax.CallOption) (*debuggerpb.ListActiveBreakpointsResponse, error)
+	UpdateActiveBreakpoint(context.Context, *debuggerpb.UpdateActiveBreakpointRequest, ...gax.CallOption) (*debuggerpb.UpdateActiveBreakpointResponse, error)
 }
 
 // Controller2Client is a client for interacting with Stackdriver Debugger API.
@@ -158,7 +158,7 @@ func (c *Controller2Client) Connection() *grpc.ClientConn {
 // This protocol allows the controller service to disable debuggees, recover
 // from data loss, or change the debuggee_id format. Agents must handle
 // debuggee_id value changing upon re-registration.
-func (c *Controller2Client) RegisterDebuggee(ctx context.Context, req *clouddebuggerpb.RegisterDebuggeeRequest, opts ...gax.CallOption) (*clouddebuggerpb.RegisterDebuggeeResponse, error) {
+func (c *Controller2Client) RegisterDebuggee(ctx context.Context, req *debuggerpb.RegisterDebuggeeRequest, opts ...gax.CallOption) (*debuggerpb.RegisterDebuggeeResponse, error) {
 	return c.internalClient.RegisterDebuggee(ctx, req, opts...)
 }
 
@@ -175,7 +175,7 @@ func (c *Controller2Client) RegisterDebuggee(ctx context.Context, req *clouddebu
 // Moreover, an agent should remember the breakpoints that are completed
 // until the controller removes them from the active list to avoid
 // setting those breakpoints again.
-func (c *Controller2Client) ListActiveBreakpoints(ctx context.Context, req *clouddebuggerpb.ListActiveBreakpointsRequest, opts ...gax.CallOption) (*clouddebuggerpb.ListActiveBreakpointsResponse, error) {
+func (c *Controller2Client) ListActiveBreakpoints(ctx context.Context, req *debuggerpb.ListActiveBreakpointsRequest, opts ...gax.CallOption) (*debuggerpb.ListActiveBreakpointsResponse, error) {
 	return c.internalClient.ListActiveBreakpoints(ctx, req, opts...)
 }
 
@@ -187,7 +187,7 @@ func (c *Controller2Client) ListActiveBreakpoints(ctx context.Context, req *clou
 // condition and expressions fields should not alter the breakpoint
 // semantics. These may only make changes such as canonicalizing a value
 // or snapping the location to the correct line of code.
-func (c *Controller2Client) UpdateActiveBreakpoint(ctx context.Context, req *clouddebuggerpb.UpdateActiveBreakpointRequest, opts ...gax.CallOption) (*clouddebuggerpb.UpdateActiveBreakpointResponse, error) {
+func (c *Controller2Client) UpdateActiveBreakpoint(ctx context.Context, req *debuggerpb.UpdateActiveBreakpointRequest, opts ...gax.CallOption) (*debuggerpb.UpdateActiveBreakpointResponse, error) {
 	return c.internalClient.UpdateActiveBreakpoint(ctx, req, opts...)
 }
 
@@ -205,7 +205,7 @@ type controller2GRPCClient struct {
 	CallOptions **Controller2CallOptions
 
 	// The gRPC API client.
-	controller2Client clouddebuggerpb.Controller2Client
+	controller2Client debuggerpb.Controller2Client
 
 	// The x-goog-* metadata to be sent with each request.
 	xGoogMetadata metadata.MD
@@ -258,7 +258,7 @@ func NewController2Client(ctx context.Context, opts ...option.ClientOption) (*Co
 	c := &controller2GRPCClient{
 		connPool:          connPool,
 		disableDeadlines:  disableDeadlines,
-		controller2Client: clouddebuggerpb.NewController2Client(connPool),
+		controller2Client: debuggerpb.NewController2Client(connPool),
 		CallOptions:       &client.CallOptions,
 	}
 	c.setGoogleClientInfo()
@@ -291,7 +291,7 @@ func (c *controller2GRPCClient) Close() error {
 	return c.connPool.Close()
 }
 
-func (c *controller2GRPCClient) RegisterDebuggee(ctx context.Context, req *clouddebuggerpb.RegisterDebuggeeRequest, opts ...gax.CallOption) (*clouddebuggerpb.RegisterDebuggeeResponse, error) {
+func (c *controller2GRPCClient) RegisterDebuggee(ctx context.Context, req *debuggerpb.RegisterDebuggeeRequest, opts ...gax.CallOption) (*debuggerpb.RegisterDebuggeeResponse, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 600000*time.Millisecond)
 		defer cancel()
@@ -299,7 +299,7 @@ func (c *controller2GRPCClient) RegisterDebuggee(ctx context.Context, req *cloud
 	}
 	ctx = insertMetadata(ctx, c.xGoogMetadata)
 	opts = append((*c.CallOptions).RegisterDebuggee[0:len((*c.CallOptions).RegisterDebuggee):len((*c.CallOptions).RegisterDebuggee)], opts...)
-	var resp *clouddebuggerpb.RegisterDebuggeeResponse
+	var resp *debuggerpb.RegisterDebuggeeResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.controller2Client.RegisterDebuggee(ctx, req, settings.GRPC...)
@@ -311,7 +311,7 @@ func (c *controller2GRPCClient) RegisterDebuggee(ctx context.Context, req *cloud
 	return resp, nil
 }
 
-func (c *controller2GRPCClient) ListActiveBreakpoints(ctx context.Context, req *clouddebuggerpb.ListActiveBreakpointsRequest, opts ...gax.CallOption) (*clouddebuggerpb.ListActiveBreakpointsResponse, error) {
+func (c *controller2GRPCClient) ListActiveBreakpoints(ctx context.Context, req *debuggerpb.ListActiveBreakpointsRequest, opts ...gax.CallOption) (*debuggerpb.ListActiveBreakpointsResponse, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 600000*time.Millisecond)
 		defer cancel()
@@ -321,7 +321,7 @@ func (c *controller2GRPCClient) ListActiveBreakpoints(ctx context.Context, req *
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).ListActiveBreakpoints[0:len((*c.CallOptions).ListActiveBreakpoints):len((*c.CallOptions).ListActiveBreakpoints)], opts...)
-	var resp *clouddebuggerpb.ListActiveBreakpointsResponse
+	var resp *debuggerpb.ListActiveBreakpointsResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.controller2Client.ListActiveBreakpoints(ctx, req, settings.GRPC...)
@@ -333,7 +333,7 @@ func (c *controller2GRPCClient) ListActiveBreakpoints(ctx context.Context, req *
 	return resp, nil
 }
 
-func (c *controller2GRPCClient) UpdateActiveBreakpoint(ctx context.Context, req *clouddebuggerpb.UpdateActiveBreakpointRequest, opts ...gax.CallOption) (*clouddebuggerpb.UpdateActiveBreakpointResponse, error) {
+func (c *controller2GRPCClient) UpdateActiveBreakpoint(ctx context.Context, req *debuggerpb.UpdateActiveBreakpointRequest, opts ...gax.CallOption) (*debuggerpb.UpdateActiveBreakpointResponse, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 600000*time.Millisecond)
 		defer cancel()
@@ -343,7 +343,7 @@ func (c *controller2GRPCClient) UpdateActiveBreakpoint(ctx context.Context, req
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).UpdateActiveBreakpoint[0:len((*c.CallOptions).UpdateActiveBreakpoint):len((*c.CallOptions).UpdateActiveBreakpoint)], opts...)
-	var resp *clouddebuggerpb.UpdateActiveBreakpointResponse
+	var resp *debuggerpb.UpdateActiveBreakpointResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.controller2Client.UpdateActiveBreakpoint(ctx, req, settings.GRPC...)
diff --git a/debugger/apiv2/controller2_client_example_test.go b/debugger/apiv2/controller2_client_example_test.go
index cd7b60393b6..8d21361d821 100644
--- a/debugger/apiv2/controller2_client_example_test.go
+++ b/debugger/apiv2/controller2_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	debugger "cloud.google.com/go/debugger/apiv2"
-	clouddebuggerpb "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
+	debuggerpb "cloud.google.com/go/debugger/apiv2/debuggerpb"
 )
 
 func ExampleNewController2Client() {
@@ -53,9 +53,9 @@ func ExampleController2Client_RegisterDebuggee() {
 	}
 	defer c.Close()
 
-	req := &clouddebuggerpb.RegisterDebuggeeRequest{
+	req := &debuggerpb.RegisterDebuggeeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#RegisterDebuggeeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#RegisterDebuggeeRequest.
 	}
 	resp, err := c.RegisterDebuggee(ctx, req)
 	if err != nil {
@@ -78,9 +78,9 @@ func ExampleController2Client_ListActiveBreakpoints() {
 	}
 	defer c.Close()
 
-	req := &clouddebuggerpb.ListActiveBreakpointsRequest{
+	req := &debuggerpb.ListActiveBreakpointsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#ListActiveBreakpointsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#ListActiveBreakpointsRequest.
 	}
 	resp, err := c.ListActiveBreakpoints(ctx, req)
 	if err != nil {
@@ -103,9 +103,9 @@ func ExampleController2Client_UpdateActiveBreakpoint() {
 	}
 	defer c.Close()
 
-	req := &clouddebuggerpb.UpdateActiveBreakpointRequest{
+	req := &debuggerpb.UpdateActiveBreakpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#UpdateActiveBreakpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#UpdateActiveBreakpointRequest.
 	}
 	resp, err := c.UpdateActiveBreakpoint(ctx, req)
 	if err != nil {
diff --git a/debugger/apiv2/debugger2_client.go b/debugger/apiv2/debugger2_client.go
index 128cbd67958..ded2e59f172 100644
--- a/debugger/apiv2/debugger2_client.go
+++ b/debugger/apiv2/debugger2_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	debuggerpb "cloud.google.com/go/debugger/apiv2/debuggerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	clouddebuggerpb "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
@@ -115,11 +115,11 @@ type internalDebugger2Client interface {
 	Close() error
 	setGoogleClientInfo(...string)
 	Connection() *grpc.ClientConn
-	SetBreakpoint(context.Context, *clouddebuggerpb.SetBreakpointRequest, ...gax.CallOption) (*clouddebuggerpb.SetBreakpointResponse, error)
-	GetBreakpoint(context.Context, *clouddebuggerpb.GetBreakpointRequest, ...gax.CallOption) (*clouddebuggerpb.GetBreakpointResponse, error)
-	DeleteBreakpoint(context.Context, *clouddebuggerpb.DeleteBreakpointRequest, ...gax.CallOption) error
-	ListBreakpoints(context.Context, *clouddebuggerpb.ListBreakpointsRequest, ...gax.CallOption) (*clouddebuggerpb.ListBreakpointsResponse, error)
-	ListDebuggees(context.Context, *clouddebuggerpb.ListDebuggeesRequest, ...gax.CallOption) (*clouddebuggerpb.ListDebuggeesResponse, error)
+	SetBreakpoint(context.Context, *debuggerpb.SetBreakpointRequest, ...gax.CallOption) (*debuggerpb.SetBreakpointResponse, error)
+	GetBreakpoint(context.Context, *debuggerpb.GetBreakpointRequest, ...gax.CallOption) (*debuggerpb.GetBreakpointResponse, error)
+	DeleteBreakpoint(context.Context, *debuggerpb.DeleteBreakpointRequest, ...gax.CallOption) error
+	ListBreakpoints(context.Context, *debuggerpb.ListBreakpointsRequest, ...gax.CallOption) (*debuggerpb.ListBreakpointsResponse, error)
+	ListDebuggees(context.Context, *debuggerpb.ListDebuggeesRequest, ...gax.CallOption) (*debuggerpb.ListDebuggeesResponse, error)
 }
 
 // Debugger2Client is a client for interacting with Stackdriver Debugger API.
@@ -169,27 +169,27 @@ func (c *Debugger2Client) Connection() *grpc.ClientConn {
 }
 
 // SetBreakpoint sets the breakpoint to the debuggee.
-func (c *Debugger2Client) SetBreakpoint(ctx context.Context, req *clouddebuggerpb.SetBreakpointRequest, opts ...gax.CallOption) (*clouddebuggerpb.SetBreakpointResponse, error) {
+func (c *Debugger2Client) SetBreakpoint(ctx context.Context, req *debuggerpb.SetBreakpointRequest, opts ...gax.CallOption) (*debuggerpb.SetBreakpointResponse, error) {
 	return c.internalClient.SetBreakpoint(ctx, req, opts...)
 }
 
 // GetBreakpoint gets breakpoint information.
-func (c *Debugger2Client) GetBreakpoint(ctx context.Context, req *clouddebuggerpb.GetBreakpointRequest, opts ...gax.CallOption) (*clouddebuggerpb.GetBreakpointResponse, error) {
+func (c *Debugger2Client) GetBreakpoint(ctx context.Context, req *debuggerpb.GetBreakpointRequest, opts ...gax.CallOption) (*debuggerpb.GetBreakpointResponse, error) {
 	return c.internalClient.GetBreakpoint(ctx, req, opts...)
 }
 
 // DeleteBreakpoint deletes the breakpoint from the debuggee.
-func (c *Debugger2Client) DeleteBreakpoint(ctx context.Context, req *clouddebuggerpb.DeleteBreakpointRequest, opts ...gax.CallOption) error {
+func (c *Debugger2Client) DeleteBreakpoint(ctx context.Context, req *debuggerpb.DeleteBreakpointRequest, opts ...gax.CallOption) error {
 	return c.internalClient.DeleteBreakpoint(ctx, req, opts...)
 }
 
 // ListBreakpoints lists all breakpoints for the debuggee.
-func (c *Debugger2Client) ListBreakpoints(ctx context.Context, req *clouddebuggerpb.ListBreakpointsRequest, opts ...gax.CallOption) (*clouddebuggerpb.ListBreakpointsResponse, error) {
+func (c *Debugger2Client) ListBreakpoints(ctx context.Context, req *debuggerpb.ListBreakpointsRequest, opts ...gax.CallOption) (*debuggerpb.ListBreakpointsResponse, error) {
 	return c.internalClient.ListBreakpoints(ctx, req, opts...)
 }
 
 // ListDebuggees lists all the debuggees that the user has access to.
-func (c *Debugger2Client) ListDebuggees(ctx context.Context, req *clouddebuggerpb.ListDebuggeesRequest, opts ...gax.CallOption) (*clouddebuggerpb.ListDebuggeesResponse, error) {
+func (c *Debugger2Client) ListDebuggees(ctx context.Context, req *debuggerpb.ListDebuggeesRequest, opts ...gax.CallOption) (*debuggerpb.ListDebuggeesResponse, error) {
 	return c.internalClient.ListDebuggees(ctx, req, opts...)
 }
 
@@ -207,7 +207,7 @@ type debugger2GRPCClient struct {
 	CallOptions **Debugger2CallOptions
 
 	// The gRPC API client.
-	debugger2Client clouddebuggerpb.Debugger2Client
+	debugger2Client debuggerpb.Debugger2Client
 
 	// The x-goog-* metadata to be sent with each request.
 	xGoogMetadata metadata.MD
@@ -252,7 +252,7 @@ func NewDebugger2Client(ctx context.Context, opts ...option.ClientOption) (*Debu
 	c := &debugger2GRPCClient{
 		connPool:         connPool,
 		disableDeadlines: disableDeadlines,
-		debugger2Client:  clouddebuggerpb.NewDebugger2Client(connPool),
+		debugger2Client:  debuggerpb.NewDebugger2Client(connPool),
 		CallOptions:      &client.CallOptions,
 	}
 	c.setGoogleClientInfo()
@@ -285,7 +285,7 @@ func (c *debugger2GRPCClient) Close() error {
 	return c.connPool.Close()
 }
 
-func (c *debugger2GRPCClient) SetBreakpoint(ctx context.Context, req *clouddebuggerpb.SetBreakpointRequest, opts ...gax.CallOption) (*clouddebuggerpb.SetBreakpointResponse, error) {
+func (c *debugger2GRPCClient) SetBreakpoint(ctx context.Context, req *debuggerpb.SetBreakpointRequest, opts ...gax.CallOption) (*debuggerpb.SetBreakpointResponse, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 600000*time.Millisecond)
 		defer cancel()
@@ -295,7 +295,7 @@ func (c *debugger2GRPCClient) SetBreakpoint(ctx context.Context, req *clouddebug
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).SetBreakpoint[0:len((*c.CallOptions).SetBreakpoint):len((*c.CallOptions).SetBreakpoint)], opts...)
-	var resp *clouddebuggerpb.SetBreakpointResponse
+	var resp *debuggerpb.SetBreakpointResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.debugger2Client.SetBreakpoint(ctx, req, settings.GRPC...)
@@ -307,7 +307,7 @@ func (c *debugger2GRPCClient) SetBreakpoint(ctx context.Context, req *clouddebug
 	return resp, nil
 }
 
-func (c *debugger2GRPCClient) GetBreakpoint(ctx context.Context, req *clouddebuggerpb.GetBreakpointRequest, opts ...gax.CallOption) (*clouddebuggerpb.GetBreakpointResponse, error) {
+func (c *debugger2GRPCClient) GetBreakpoint(ctx context.Context, req *debuggerpb.GetBreakpointRequest, opts ...gax.CallOption) (*debuggerpb.GetBreakpointResponse, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 600000*time.Millisecond)
 		defer cancel()
@@ -317,7 +317,7 @@ func (c *debugger2GRPCClient) GetBreakpoint(ctx context.Context, req *clouddebug
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).GetBreakpoint[0:len((*c.CallOptions).GetBreakpoint):len((*c.CallOptions).GetBreakpoint)], opts...)
-	var resp *clouddebuggerpb.GetBreakpointResponse
+	var resp *debuggerpb.GetBreakpointResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.debugger2Client.GetBreakpoint(ctx, req, settings.GRPC...)
@@ -329,7 +329,7 @@ func (c *debugger2GRPCClient) GetBreakpoint(ctx context.Context, req *clouddebug
 	return resp, nil
 }
 
-func (c *debugger2GRPCClient) DeleteBreakpoint(ctx context.Context, req *clouddebuggerpb.DeleteBreakpointRequest, opts ...gax.CallOption) error {
+func (c *debugger2GRPCClient) DeleteBreakpoint(ctx context.Context, req *debuggerpb.DeleteBreakpointRequest, opts ...gax.CallOption) error {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 600000*time.Millisecond)
 		defer cancel()
@@ -347,7 +347,7 @@ func (c *debugger2GRPCClient) DeleteBreakpoint(ctx context.Context, req *cloudde
 	return err
 }
 
-func (c *debugger2GRPCClient) ListBreakpoints(ctx context.Context, req *clouddebuggerpb.ListBreakpointsRequest, opts ...gax.CallOption) (*clouddebuggerpb.ListBreakpointsResponse, error) {
+func (c *debugger2GRPCClient) ListBreakpoints(ctx context.Context, req *debuggerpb.ListBreakpointsRequest, opts ...gax.CallOption) (*debuggerpb.ListBreakpointsResponse, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 600000*time.Millisecond)
 		defer cancel()
@@ -357,7 +357,7 @@ func (c *debugger2GRPCClient) ListBreakpoints(ctx context.Context, req *clouddeb
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).ListBreakpoints[0:len((*c.CallOptions).ListBreakpoints):len((*c.CallOptions).ListBreakpoints)], opts...)
-	var resp *clouddebuggerpb.ListBreakpointsResponse
+	var resp *debuggerpb.ListBreakpointsResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.debugger2Client.ListBreakpoints(ctx, req, settings.GRPC...)
@@ -369,7 +369,7 @@ func (c *debugger2GRPCClient) ListBreakpoints(ctx context.Context, req *clouddeb
 	return resp, nil
 }
 
-func (c *debugger2GRPCClient) ListDebuggees(ctx context.Context, req *clouddebuggerpb.ListDebuggeesRequest, opts ...gax.CallOption) (*clouddebuggerpb.ListDebuggeesResponse, error) {
+func (c *debugger2GRPCClient) ListDebuggees(ctx context.Context, req *debuggerpb.ListDebuggeesRequest, opts ...gax.CallOption) (*debuggerpb.ListDebuggeesResponse, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 600000*time.Millisecond)
 		defer cancel()
@@ -377,7 +377,7 @@ func (c *debugger2GRPCClient) ListDebuggees(ctx context.Context, req *clouddebug
 	}
 	ctx = insertMetadata(ctx, c.xGoogMetadata)
 	opts = append((*c.CallOptions).ListDebuggees[0:len((*c.CallOptions).ListDebuggees):len((*c.CallOptions).ListDebuggees)], opts...)
-	var resp *clouddebuggerpb.ListDebuggeesResponse
+	var resp *debuggerpb.ListDebuggeesResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.debugger2Client.ListDebuggees(ctx, req, settings.GRPC...)
diff --git a/debugger/apiv2/debugger2_client_example_test.go b/debugger/apiv2/debugger2_client_example_test.go
index 4f65977d1a1..03a66722435 100644
--- a/debugger/apiv2/debugger2_client_example_test.go
+++ b/debugger/apiv2/debugger2_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	debugger "cloud.google.com/go/debugger/apiv2"
-	clouddebuggerpb "google.golang.org/genproto/googleapis/devtools/clouddebugger/v2"
+	debuggerpb "cloud.google.com/go/debugger/apiv2/debuggerpb"
 )
 
 func ExampleNewDebugger2Client() {
@@ -53,9 +53,9 @@ func ExampleDebugger2Client_SetBreakpoint() {
 	}
 	defer c.Close()
 
-	req := &clouddebuggerpb.SetBreakpointRequest{
+	req := &debuggerpb.SetBreakpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#SetBreakpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#SetBreakpointRequest.
 	}
 	resp, err := c.SetBreakpoint(ctx, req)
 	if err != nil {
@@ -78,9 +78,9 @@ func ExampleDebugger2Client_GetBreakpoint() {
 	}
 	defer c.Close()
 
-	req := &clouddebuggerpb.GetBreakpointRequest{
+	req := &debuggerpb.GetBreakpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#GetBreakpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#GetBreakpointRequest.
 	}
 	resp, err := c.GetBreakpoint(ctx, req)
 	if err != nil {
@@ -103,9 +103,9 @@ func ExampleDebugger2Client_DeleteBreakpoint() {
 	}
 	defer c.Close()
 
-	req := &clouddebuggerpb.DeleteBreakpointRequest{
+	req := &debuggerpb.DeleteBreakpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#DeleteBreakpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#DeleteBreakpointRequest.
 	}
 	err = c.DeleteBreakpoint(ctx, req)
 	if err != nil {
@@ -126,9 +126,9 @@ func ExampleDebugger2Client_ListBreakpoints() {
 	}
 	defer c.Close()
 
-	req := &clouddebuggerpb.ListBreakpointsRequest{
+	req := &debuggerpb.ListBreakpointsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#ListBreakpointsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#ListBreakpointsRequest.
 	}
 	resp, err := c.ListBreakpoints(ctx, req)
 	if err != nil {
@@ -151,9 +151,9 @@ func ExampleDebugger2Client_ListDebuggees() {
 	}
 	defer c.Close()
 
-	req := &clouddebuggerpb.ListDebuggeesRequest{
+	req := &debuggerpb.ListDebuggeesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#ListDebuggeesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#ListDebuggeesRequest.
 	}
 	resp, err := c.ListDebuggees(ctx, req)
 	if err != nil {
diff --git a/debugger/apiv2/debuggerpb/controller.pb.go b/debugger/apiv2/debuggerpb/controller.pb.go
index 2213ca1c23c..369f1717d91 100644
--- a/debugger/apiv2/debuggerpb/controller.pb.go
+++ b/debugger/apiv2/debuggerpb/controller.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/clouddebugger/v2/controller.proto
 
 package debuggerpb
diff --git a/debugger/apiv2/debuggerpb/data.pb.go b/debugger/apiv2/debuggerpb/data.pb.go
index 055bac7bdb5..0bc3aa2227a 100644
--- a/debugger/apiv2/debuggerpb/data.pb.go
+++ b/debugger/apiv2/debuggerpb/data.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/clouddebugger/v2/data.proto
 
 package debuggerpb
@@ -25,11 +25,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	v1 "google.golang.org/genproto/googleapis/devtools/source/v1"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -548,7 +548,7 @@ type Variable struct {
 	// Reference to a variable in the shared variable table. More than
 	// one variable can reference the same variable in the table. The
 	// `var_table_index` field is an index into `variable_table` in Breakpoint.
-	VarTableIndex *wrappers.Int32Value `protobuf:"bytes,4,opt,name=var_table_index,json=varTableIndex,proto3" json:"var_table_index,omitempty"`
+	VarTableIndex *wrapperspb.Int32Value `protobuf:"bytes,4,opt,name=var_table_index,json=varTableIndex,proto3" json:"var_table_index,omitempty"`
 	// Status associated with the variable. This field will usually stay
 	// unset. A status of a single variable only applies to that variable or
 	// expression. The rest of breakpoint data still remains valid. Variables
@@ -631,7 +631,7 @@ func (x *Variable) GetMembers() []*Variable {
 	return nil
 }
 
-func (x *Variable) GetVarTableIndex() *wrappers.Int32Value {
+func (x *Variable) GetVarTableIndex() *wrapperspb.Int32Value {
 	if x != nil {
 		return x.VarTableIndex
 	}
@@ -760,10 +760,10 @@ type Breakpoint struct {
 	// breakpoint state will not change from here on.
 	IsFinalState bool `protobuf:"varint,5,opt,name=is_final_state,json=isFinalState,proto3" json:"is_final_state,omitempty"`
 	// Time this breakpoint was created by the server in seconds resolution.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time this breakpoint was finalized as seen by the server in seconds
 	// resolution.
-	FinalTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=final_time,json=finalTime,proto3" json:"final_time,omitempty"`
+	FinalTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=final_time,json=finalTime,proto3" json:"final_time,omitempty"`
 	// E-mail address of the user that created this breakpoint
 	UserEmail string `protobuf:"bytes,16,opt,name=user_email,json=userEmail,proto3" json:"user_email,omitempty"`
 	// Breakpoint status.
@@ -899,14 +899,14 @@ func (x *Breakpoint) GetIsFinalState() bool {
 	return false
 }
 
-func (x *Breakpoint) GetCreateTime() *timestamp.Timestamp {
+func (x *Breakpoint) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Breakpoint) GetFinalTime() *timestamp.Timestamp {
+func (x *Breakpoint) GetFinalTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.FinalTime
 	}
@@ -1354,8 +1354,8 @@ var file_google_devtools_clouddebugger_v2_data_proto_goTypes = []interface{}{
 	(*Debuggee)(nil),                 // 9: google.devtools.clouddebugger.v2.Debuggee
 	nil,                              // 10: google.devtools.clouddebugger.v2.Breakpoint.LabelsEntry
 	nil,                              // 11: google.devtools.clouddebugger.v2.Debuggee.LabelsEntry
-	(*wrappers.Int32Value)(nil),      // 12: google.protobuf.Int32Value
-	(*timestamp.Timestamp)(nil),      // 13: google.protobuf.Timestamp
+	(*wrapperspb.Int32Value)(nil),    // 12: google.protobuf.Int32Value
+	(*timestamppb.Timestamp)(nil),    // 13: google.protobuf.Timestamp
 	(*v1.SourceContext)(nil),         // 14: google.devtools.source.v1.SourceContext
 	(*v1.ExtendedSourceContext)(nil), // 15: google.devtools.source.v1.ExtendedSourceContext
 }
diff --git a/debugger/apiv2/debuggerpb/debugger.pb.go b/debugger/apiv2/debuggerpb/debugger.pb.go
index fc8a131ca62..116316fad96 100644
--- a/debugger/apiv2/debuggerpb/debugger.pb.go
+++ b/debugger/apiv2/debuggerpb/debugger.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/clouddebugger/v2/debugger.proto
 
 package debuggerpb
@@ -26,13 +26,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -933,7 +933,7 @@ var file_google_devtools_clouddebugger_v2_debugger_proto_goTypes = []interface{}
 	(*Breakpoint)(nil),                                   // 10: google.devtools.clouddebugger.v2.Breakpoint
 	(*Debuggee)(nil),                                     // 11: google.devtools.clouddebugger.v2.Debuggee
 	(Breakpoint_Action)(0),                               // 12: google.devtools.clouddebugger.v2.Breakpoint.Action
-	(*empty.Empty)(nil),                                  // 13: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                // 13: google.protobuf.Empty
 }
 var file_google_devtools_clouddebugger_v2_debugger_proto_depIdxs = []int32{
 	10, // 0: google.devtools.clouddebugger.v2.SetBreakpointRequest.breakpoint:type_name -> google.devtools.clouddebugger.v2.Breakpoint
@@ -1125,7 +1125,7 @@ type Debugger2Client interface {
 	// Gets breakpoint information.
 	GetBreakpoint(ctx context.Context, in *GetBreakpointRequest, opts ...grpc.CallOption) (*GetBreakpointResponse, error)
 	// Deletes the breakpoint from the debuggee.
-	DeleteBreakpoint(ctx context.Context, in *DeleteBreakpointRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteBreakpoint(ctx context.Context, in *DeleteBreakpointRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists all breakpoints for the debuggee.
 	ListBreakpoints(ctx context.Context, in *ListBreakpointsRequest, opts ...grpc.CallOption) (*ListBreakpointsResponse, error)
 	// Lists all the debuggees that the user has access to.
@@ -1158,8 +1158,8 @@ func (c *debugger2Client) GetBreakpoint(ctx context.Context, in *GetBreakpointRe
 	return out, nil
 }
 
-func (c *debugger2Client) DeleteBreakpoint(ctx context.Context, in *DeleteBreakpointRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *debugger2Client) DeleteBreakpoint(ctx context.Context, in *DeleteBreakpointRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.devtools.clouddebugger.v2.Debugger2/DeleteBreakpoint", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1192,7 +1192,7 @@ type Debugger2Server interface {
 	// Gets breakpoint information.
 	GetBreakpoint(context.Context, *GetBreakpointRequest) (*GetBreakpointResponse, error)
 	// Deletes the breakpoint from the debuggee.
-	DeleteBreakpoint(context.Context, *DeleteBreakpointRequest) (*empty.Empty, error)
+	DeleteBreakpoint(context.Context, *DeleteBreakpointRequest) (*emptypb.Empty, error)
 	// Lists all breakpoints for the debuggee.
 	ListBreakpoints(context.Context, *ListBreakpointsRequest) (*ListBreakpointsResponse, error)
 	// Lists all the debuggees that the user has access to.
@@ -1209,7 +1209,7 @@ func (*UnimplementedDebugger2Server) SetBreakpoint(context.Context, *SetBreakpoi
 func (*UnimplementedDebugger2Server) GetBreakpoint(context.Context, *GetBreakpointRequest) (*GetBreakpointResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetBreakpoint not implemented")
 }
-func (*UnimplementedDebugger2Server) DeleteBreakpoint(context.Context, *DeleteBreakpointRequest) (*empty.Empty, error) {
+func (*UnimplementedDebugger2Server) DeleteBreakpoint(context.Context, *DeleteBreakpointRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteBreakpoint not implemented")
 }
 func (*UnimplementedDebugger2Server) ListBreakpoints(context.Context, *ListBreakpointsRequest) (*ListBreakpointsResponse, error) {
diff --git a/debugger/apiv2/doc.go b/debugger/apiv2/doc.go
index 68a43859ccc..5f5061d2d53 100644
--- a/debugger/apiv2/doc.go
+++ b/debugger/apiv2/doc.go
@@ -56,9 +56,9 @@
 //	}
 //	defer c.Close()
 //
-//	req := &clouddebuggerpb.RegisterDebuggeeRequest{
+//	req := &debuggerpb.RegisterDebuggeeRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/clouddebugger/v2#RegisterDebuggeeRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/debugger/apiv2/debuggerpb#RegisterDebuggeeRequest.
 //	}
 //	resp, err := c.RegisterDebuggee(ctx, req)
 //	if err != nil {
diff --git a/deploy/aliasshim/aliasshim.go b/deploy/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/deploy/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/deploy/apiv1/cloud_deploy_client.go b/deploy/apiv1/cloud_deploy_client.go
index c157043b7d1..0de4288f0a5 100644
--- a/deploy/apiv1/cloud_deploy_client.go
+++ b/deploy/apiv1/cloud_deploy_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/deploy/apiv1/cloud_deploy_client_example_test.go b/deploy/apiv1/cloud_deploy_client_example_test.go
index a0d53ea402b..2594e290b67 100644
--- a/deploy/apiv1/cloud_deploy_client_example_test.go
+++ b/deploy/apiv1/cloud_deploy_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 	"google.golang.org/api/iterator"
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleCloudDeployClient_ListDeliveryPipelines() {
 
 	req := &deploypb.ListDeliveryPipelinesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListDeliveryPipelinesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListDeliveryPipelinesRequest.
 	}
 	it := c.ListDeliveryPipelines(ctx, req)
 	for {
@@ -90,7 +90,7 @@ func ExampleCloudDeployClient_GetDeliveryPipeline() {
 
 	req := &deploypb.GetDeliveryPipelineRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetDeliveryPipelineRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetDeliveryPipelineRequest.
 	}
 	resp, err := c.GetDeliveryPipeline(ctx, req)
 	if err != nil {
@@ -115,7 +115,7 @@ func ExampleCloudDeployClient_CreateDeliveryPipeline() {
 
 	req := &deploypb.CreateDeliveryPipelineRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#CreateDeliveryPipelineRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#CreateDeliveryPipelineRequest.
 	}
 	op, err := c.CreateDeliveryPipeline(ctx, req)
 	if err != nil {
@@ -145,7 +145,7 @@ func ExampleCloudDeployClient_UpdateDeliveryPipeline() {
 
 	req := &deploypb.UpdateDeliveryPipelineRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#UpdateDeliveryPipelineRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#UpdateDeliveryPipelineRequest.
 	}
 	op, err := c.UpdateDeliveryPipeline(ctx, req)
 	if err != nil {
@@ -175,7 +175,7 @@ func ExampleCloudDeployClient_DeleteDeliveryPipeline() {
 
 	req := &deploypb.DeleteDeliveryPipelineRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#DeleteDeliveryPipelineRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#DeleteDeliveryPipelineRequest.
 	}
 	op, err := c.DeleteDeliveryPipeline(ctx, req)
 	if err != nil {
@@ -203,7 +203,7 @@ func ExampleCloudDeployClient_ListTargets() {
 
 	req := &deploypb.ListTargetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListTargetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListTargetsRequest.
 	}
 	it := c.ListTargets(ctx, req)
 	for {
@@ -234,7 +234,7 @@ func ExampleCloudDeployClient_GetTarget() {
 
 	req := &deploypb.GetTargetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetTargetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetTargetRequest.
 	}
 	resp, err := c.GetTarget(ctx, req)
 	if err != nil {
@@ -259,7 +259,7 @@ func ExampleCloudDeployClient_CreateTarget() {
 
 	req := &deploypb.CreateTargetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#CreateTargetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#CreateTargetRequest.
 	}
 	op, err := c.CreateTarget(ctx, req)
 	if err != nil {
@@ -289,7 +289,7 @@ func ExampleCloudDeployClient_UpdateTarget() {
 
 	req := &deploypb.UpdateTargetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#UpdateTargetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#UpdateTargetRequest.
 	}
 	op, err := c.UpdateTarget(ctx, req)
 	if err != nil {
@@ -319,7 +319,7 @@ func ExampleCloudDeployClient_DeleteTarget() {
 
 	req := &deploypb.DeleteTargetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#DeleteTargetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#DeleteTargetRequest.
 	}
 	op, err := c.DeleteTarget(ctx, req)
 	if err != nil {
@@ -347,7 +347,7 @@ func ExampleCloudDeployClient_ListReleases() {
 
 	req := &deploypb.ListReleasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListReleasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListReleasesRequest.
 	}
 	it := c.ListReleases(ctx, req)
 	for {
@@ -378,7 +378,7 @@ func ExampleCloudDeployClient_GetRelease() {
 
 	req := &deploypb.GetReleaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetReleaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetReleaseRequest.
 	}
 	resp, err := c.GetRelease(ctx, req)
 	if err != nil {
@@ -403,7 +403,7 @@ func ExampleCloudDeployClient_CreateRelease() {
 
 	req := &deploypb.CreateReleaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#CreateReleaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#CreateReleaseRequest.
 	}
 	op, err := c.CreateRelease(ctx, req)
 	if err != nil {
@@ -433,7 +433,7 @@ func ExampleCloudDeployClient_AbandonRelease() {
 
 	req := &deploypb.AbandonReleaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#AbandonReleaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#AbandonReleaseRequest.
 	}
 	resp, err := c.AbandonRelease(ctx, req)
 	if err != nil {
@@ -458,7 +458,7 @@ func ExampleCloudDeployClient_ApproveRollout() {
 
 	req := &deploypb.ApproveRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ApproveRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ApproveRolloutRequest.
 	}
 	resp, err := c.ApproveRollout(ctx, req)
 	if err != nil {
@@ -483,7 +483,7 @@ func ExampleCloudDeployClient_ListRollouts() {
 
 	req := &deploypb.ListRolloutsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListRolloutsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListRolloutsRequest.
 	}
 	it := c.ListRollouts(ctx, req)
 	for {
@@ -514,7 +514,7 @@ func ExampleCloudDeployClient_GetRollout() {
 
 	req := &deploypb.GetRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetRolloutRequest.
 	}
 	resp, err := c.GetRollout(ctx, req)
 	if err != nil {
@@ -539,7 +539,7 @@ func ExampleCloudDeployClient_CreateRollout() {
 
 	req := &deploypb.CreateRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#CreateRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#CreateRolloutRequest.
 	}
 	op, err := c.CreateRollout(ctx, req)
 	if err != nil {
@@ -569,7 +569,7 @@ func ExampleCloudDeployClient_RetryJob() {
 
 	req := &deploypb.RetryJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#RetryJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#RetryJobRequest.
 	}
 	resp, err := c.RetryJob(ctx, req)
 	if err != nil {
@@ -594,7 +594,7 @@ func ExampleCloudDeployClient_ListJobRuns() {
 
 	req := &deploypb.ListJobRunsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListJobRunsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListJobRunsRequest.
 	}
 	it := c.ListJobRuns(ctx, req)
 	for {
@@ -625,7 +625,7 @@ func ExampleCloudDeployClient_GetJobRun() {
 
 	req := &deploypb.GetJobRunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetJobRunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetJobRunRequest.
 	}
 	resp, err := c.GetJobRun(ctx, req)
 	if err != nil {
@@ -650,7 +650,7 @@ func ExampleCloudDeployClient_GetConfig() {
 
 	req := &deploypb.GetConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetConfigRequest.
 	}
 	resp, err := c.GetConfig(ctx, req)
 	if err != nil {
diff --git a/deploy/apiv1/deploypb/cloud_deploy.pb.go b/deploy/apiv1/deploypb/cloud_deploy.pb.go
index 1f9b0c988ef..49da8069950 100644
--- a/deploy/apiv1/deploypb/cloud_deploy.pb.go
+++ b/deploy/apiv1/deploypb/cloud_deploy.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/deploy/v1/cloud_deploy.proto
 
 package deploypb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	date "google.golang.org/genproto/googleapis/type/date"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -827,9 +827,9 @@ type DeliveryPipeline struct {
 	// Both keys and values are additionally constrained to be <= 128 bytes.
 	Labels map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. Time at which the pipeline was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Most recent time at which the pipeline was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The ordering configuration of the `DeliveryPipeline`.
 	//
 	// Types that are assignable to Pipeline:
@@ -914,14 +914,14 @@ func (x *DeliveryPipeline) GetLabels() map[string]string {
 	return nil
 }
 
-func (x *DeliveryPipeline) GetCreateTime() *timestamp.Timestamp {
+func (x *DeliveryPipeline) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *DeliveryPipeline) GetUpdateTime() *timestamp.Timestamp {
+func (x *DeliveryPipeline) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1232,7 +1232,7 @@ type PipelineReadyCondition struct {
 	// is wrong with the Pipeline.
 	Status bool `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
 	// Last time the condition was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *PipelineReadyCondition) Reset() {
@@ -1274,7 +1274,7 @@ func (x *PipelineReadyCondition) GetStatus() bool {
 	return false
 }
 
-func (x *PipelineReadyCondition) GetUpdateTime() *timestamp.Timestamp {
+func (x *PipelineReadyCondition) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1294,7 +1294,7 @@ type TargetsPresentCondition struct {
 	// projects/{project_id}/locations/{location_name}/targets/{target_name}.
 	MissingTargets []string `protobuf:"bytes,2,rep,name=missing_targets,json=missingTargets,proto3" json:"missing_targets,omitempty"`
 	// Last time the condition was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *TargetsPresentCondition) Reset() {
@@ -1343,7 +1343,7 @@ func (x *TargetsPresentCondition) GetMissingTargets() []string {
 	return nil
 }
 
-func (x *TargetsPresentCondition) GetUpdateTime() *timestamp.Timestamp {
+func (x *TargetsPresentCondition) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1730,7 +1730,7 @@ type UpdateDeliveryPipelineRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The `DeliveryPipeline` to update.
 	DeliveryPipeline *DeliveryPipeline `protobuf:"bytes,2,opt,name=delivery_pipeline,json=deliveryPipeline,proto3" json:"delivery_pipeline,omitempty"`
 	// Optional. A request ID to identify requests. Specify a unique request ID
@@ -1787,7 +1787,7 @@ func (*UpdateDeliveryPipelineRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_deploy_v1_cloud_deploy_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *UpdateDeliveryPipelineRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDeliveryPipelineRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1974,9 +1974,9 @@ type Target struct {
 	// Optional. Whether or not the `Target` requires approval.
 	RequireApproval bool `protobuf:"varint,13,opt,name=require_approval,json=requireApproval,proto3" json:"require_approval,omitempty"`
 	// Output only. Time at which the `Target` was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Most recent time at which the `Target` was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Destination to which the Skaffold configuration is applied during a
 	// rollout.
 	//
@@ -2081,14 +2081,14 @@ func (x *Target) GetRequireApproval() bool {
 	return false
 }
 
-func (x *Target) GetCreateTime() *timestamp.Timestamp {
+func (x *Target) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Target) GetUpdateTime() *timestamp.Timestamp {
+func (x *Target) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2194,7 +2194,7 @@ type ExecutionConfig struct {
 	// Optional. Execution timeout for a Cloud Build Execution. This must be between 10m and
 	// 24h in seconds format.
 	// If unspecified, a default timeout of 1h is used.
-	ExecutionTimeout *duration.Duration `protobuf:"bytes,7,opt,name=execution_timeout,json=executionTimeout,proto3" json:"execution_timeout,omitempty"`
+	ExecutionTimeout *durationpb.Duration `protobuf:"bytes,7,opt,name=execution_timeout,json=executionTimeout,proto3" json:"execution_timeout,omitempty"`
 }
 
 func (x *ExecutionConfig) Reset() {
@@ -2278,7 +2278,7 @@ func (x *ExecutionConfig) GetArtifactStorage() string {
 	return ""
 }
 
-func (x *ExecutionConfig) GetExecutionTimeout() *duration.Duration {
+func (x *ExecutionConfig) GetExecutionTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.ExecutionTimeout
 	}
@@ -2928,7 +2928,7 @@ type UpdateTargetRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The `Target` to update.
 	Target *Target `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"`
 	// Optional. A request ID to identify requests. Specify a unique request ID
@@ -2985,7 +2985,7 @@ func (*UpdateTargetRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_deploy_v1_cloud_deploy_proto_rawDescGZIP(), []int{25}
 }
 
-func (x *UpdateTargetRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTargetRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3160,11 +3160,11 @@ type Release struct {
 	// Output only. Indicates whether this is an abandoned release.
 	Abandoned bool `protobuf:"varint,23,opt,name=abandoned,proto3" json:"abandoned,omitempty"`
 	// Output only. Time at which the `Release` was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time at which the render began.
-	RenderStartTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=render_start_time,json=renderStartTime,proto3" json:"render_start_time,omitempty"`
+	RenderStartTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=render_start_time,json=renderStartTime,proto3" json:"render_start_time,omitempty"`
 	// Output only. Time at which the render completed.
-	RenderEndTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=render_end_time,json=renderEndTime,proto3" json:"render_end_time,omitempty"`
+	RenderEndTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=render_end_time,json=renderEndTime,proto3" json:"render_end_time,omitempty"`
 	// Cloud Storage URI of tar.gz archive containing Skaffold configuration.
 	SkaffoldConfigUri string `protobuf:"bytes,17,opt,name=skaffold_config_uri,json=skaffoldConfigUri,proto3" json:"skaffold_config_uri,omitempty"`
 	// Filepath of the Skaffold config inside of the config URI.
@@ -3268,21 +3268,21 @@ func (x *Release) GetAbandoned() bool {
 	return false
 }
 
-func (x *Release) GetCreateTime() *timestamp.Timestamp {
+func (x *Release) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Release) GetRenderStartTime() *timestamp.Timestamp {
+func (x *Release) GetRenderStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RenderStartTime
 	}
 	return nil
 }
 
-func (x *Release) GetRenderEndTime() *timestamp.Timestamp {
+func (x *Release) GetRenderEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RenderEndTime
 	}
@@ -3854,15 +3854,15 @@ type Rollout struct {
 	// Both keys and values are additionally constrained to be <= 128 bytes.
 	Labels map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. Time at which the `Rollout` was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time at which the `Rollout` was approved.
-	ApproveTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=approve_time,json=approveTime,proto3" json:"approve_time,omitempty"`
+	ApproveTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=approve_time,json=approveTime,proto3" json:"approve_time,omitempty"`
 	// Output only. Time at which the `Rollout` was enqueued.
-	EnqueueTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=enqueue_time,json=enqueueTime,proto3" json:"enqueue_time,omitempty"`
+	EnqueueTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=enqueue_time,json=enqueueTime,proto3" json:"enqueue_time,omitempty"`
 	// Output only. Time at which the `Rollout` started deploying.
-	DeployStartTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=deploy_start_time,json=deployStartTime,proto3" json:"deploy_start_time,omitempty"`
+	DeployStartTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=deploy_start_time,json=deployStartTime,proto3" json:"deploy_start_time,omitempty"`
 	// Output only. Time at which the `Rollout` finished deploying.
-	DeployEndTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=deploy_end_time,json=deployEndTime,proto3" json:"deploy_end_time,omitempty"`
+	DeployEndTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=deploy_end_time,json=deployEndTime,proto3" json:"deploy_end_time,omitempty"`
 	// Required. The ID of Target to which this `Rollout` is deploying.
 	TargetId string `protobuf:"bytes,18,opt,name=target_id,json=targetId,proto3" json:"target_id,omitempty"`
 	// Output only. Approval state of the `Rollout`.
@@ -3955,35 +3955,35 @@ func (x *Rollout) GetLabels() map[string]string {
 	return nil
 }
 
-func (x *Rollout) GetCreateTime() *timestamp.Timestamp {
+func (x *Rollout) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Rollout) GetApproveTime() *timestamp.Timestamp {
+func (x *Rollout) GetApproveTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ApproveTime
 	}
 	return nil
 }
 
-func (x *Rollout) GetEnqueueTime() *timestamp.Timestamp {
+func (x *Rollout) GetEnqueueTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EnqueueTime
 	}
 	return nil
 }
 
-func (x *Rollout) GetDeployStartTime() *timestamp.Timestamp {
+func (x *Rollout) GetDeployStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeployStartTime
 	}
 	return nil
 }
 
-func (x *Rollout) GetDeployEndTime() *timestamp.Timestamp {
+func (x *Rollout) GetDeployEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeployEndTime
 	}
@@ -4877,9 +4877,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -4927,14 +4927,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_deploy_v1_cloud_deploy_proto_rawDescGZIP(), []int{47}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -5292,11 +5292,11 @@ type JobRun struct {
 	// Output only. ID of the `Rollout` job this `JobRun` corresponds to.
 	JobId string `protobuf:"bytes,4,opt,name=job_id,json=jobId,proto3" json:"job_id,omitempty"`
 	// Output only. Time at which the `JobRun` was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time at which the `JobRun` was started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. Time at which the `JobRun` ended.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The current state of the `JobRun`.
 	State JobRun_State `protobuf:"varint,8,opt,name=state,proto3,enum=google.cloud.deploy.v1.JobRun_State" json:"state,omitempty"`
 	// The `JobRun` type and the information for that type.
@@ -5372,21 +5372,21 @@ func (x *JobRun) GetJobId() string {
 	return ""
 }
 
-func (x *JobRun) GetCreateTime() *timestamp.Timestamp {
+func (x *JobRun) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *JobRun) GetStartTime() *timestamp.Timestamp {
+func (x *JobRun) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *JobRun) GetEndTime() *timestamp.Timestamp {
+func (x *JobRun) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -7616,9 +7616,9 @@ var file_google_cloud_deploy_v1_cloud_deploy_proto_goTypes = []interface{}{
 	nil,                                            // 83: google.cloud.deploy.v1.Release.TargetRendersEntry
 	nil,                                            // 84: google.cloud.deploy.v1.Rollout.AnnotationsEntry
 	nil,                                            // 85: google.cloud.deploy.v1.Rollout.LabelsEntry
-	(*timestamp.Timestamp)(nil),                    // 86: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                   // 87: google.protobuf.FieldMask
-	(*duration.Duration)(nil),                      // 88: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                  // 86: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                  // 87: google.protobuf.FieldMask
+	(*durationpb.Duration)(nil),                    // 88: google.protobuf.Duration
 	(*date.Date)(nil),                              // 89: google.type.Date
 	(*longrunning.Operation)(nil),                  // 90: google.longrunning.Operation
 }
diff --git a/deploy/apiv1/deploypb/deliverypipeline_notification_payload.pb.go b/deploy/apiv1/deploypb/deliverypipeline_notification_payload.pb.go
index 062630d61ae..ded605faff2 100644
--- a/deploy/apiv1/deploypb/deliverypipeline_notification_payload.pb.go
+++ b/deploy/apiv1/deploypb/deliverypipeline_notification_payload.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/deploy/v1/deliverypipeline_notification_payload.proto
 
 package deploypb
diff --git a/deploy/apiv1/deploypb/jobrun_notification_payload.pb.go b/deploy/apiv1/deploypb/jobrun_notification_payload.pb.go
index 69b3c75d925..006651d3a59 100644
--- a/deploy/apiv1/deploypb/jobrun_notification_payload.pb.go
+++ b/deploy/apiv1/deploypb/jobrun_notification_payload.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/deploy/v1/jobrun_notification_payload.proto
 
 package deploypb
diff --git a/deploy/apiv1/deploypb/log_enums.pb.go b/deploy/apiv1/deploypb/log_enums.pb.go
index bea9db79e1a..be51f9c2c61 100644
--- a/deploy/apiv1/deploypb/log_enums.pb.go
+++ b/deploy/apiv1/deploypb/log_enums.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/deploy/v1/log_enums.proto
 
 package deploypb
diff --git a/deploy/apiv1/deploypb/release_notification_payload.pb.go b/deploy/apiv1/deploypb/release_notification_payload.pb.go
index c550c71bb38..3dc156bff9d 100644
--- a/deploy/apiv1/deploypb/release_notification_payload.pb.go
+++ b/deploy/apiv1/deploypb/release_notification_payload.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/deploy/v1/release_notification_payload.proto
 
 package deploypb
diff --git a/deploy/apiv1/deploypb/release_render_payload.pb.go b/deploy/apiv1/deploypb/release_render_payload.pb.go
index 2c5044c21a7..d0fb10ade46 100644
--- a/deploy/apiv1/deploypb/release_render_payload.pb.go
+++ b/deploy/apiv1/deploypb/release_render_payload.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/deploy/v1/release_render_payload.proto
 
 package deploypb
diff --git a/deploy/apiv1/deploypb/rollout_notification_payload.pb.go b/deploy/apiv1/deploypb/rollout_notification_payload.pb.go
index 046db524d51..5028c5c45fe 100644
--- a/deploy/apiv1/deploypb/rollout_notification_payload.pb.go
+++ b/deploy/apiv1/deploypb/rollout_notification_payload.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/deploy/v1/rollout_notification_payload.proto
 
 package deploypb
diff --git a/deploy/apiv1/deploypb/target_notification_payload.pb.go b/deploy/apiv1/deploypb/target_notification_payload.pb.go
index 9f65c73f4d7..2bd2ebbec95 100644
--- a/deploy/apiv1/deploypb/target_notification_payload.pb.go
+++ b/deploy/apiv1/deploypb/target_notification_payload.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/deploy/v1/target_notification_payload.proto
 
 package deploypb
diff --git a/deploy/apiv1/doc.go b/deploy/apiv1/doc.go
index cb882313fb4..6c15c34e5a9 100644
--- a/deploy/apiv1/doc.go
+++ b/deploy/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &deploypb.ListDeliveryPipelinesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListDeliveryPipelinesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListDeliveryPipelinesRequest.
 //	}
 //	it := c.ListDeliveryPipelines(ctx, req)
 //	for {
diff --git a/deploy/go.mod b/deploy/go.mod
index 6b366102dee..7232ba93938 100644
--- a/deploy/go.mod
+++ b/deploy/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/deploy
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/deploy/go.sum b/deploy/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/deploy/go.sum
+++ b/deploy/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/dialogflow/apiv2/agents_client.go b/dialogflow/apiv2/agents_client.go
index 356524e47e7..188d228254d 100644
--- a/dialogflow/apiv2/agents_client.go
+++ b/dialogflow/apiv2/agents_client.go
@@ -23,21 +23,21 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
-	structpb "github.com/golang/protobuf/ptypes/struct"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 var newAgentsClientHook clientHook
diff --git a/dialogflow/apiv2/agents_client_example_test.go b/dialogflow/apiv2/agents_client_example_test.go
index 748d5800cad..1775cd6b624 100644
--- a/dialogflow/apiv2/agents_client_example_test.go
+++ b/dialogflow/apiv2/agents_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleAgentsClient_GetAgent() {
 
 	req := &dialogflowpb.GetAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetAgentRequest.
 	}
 	resp, err := c.GetAgent(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleAgentsClient_SetAgent() {
 
 	req := &dialogflowpb.SetAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SetAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SetAgentRequest.
 	}
 	resp, err := c.SetAgent(ctx, req)
 	if err != nil {
@@ -108,7 +108,7 @@ func ExampleAgentsClient_DeleteAgent() {
 
 	req := &dialogflowpb.DeleteAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteAgentRequest.
 	}
 	err = c.DeleteAgent(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleAgentsClient_SearchAgents() {
 
 	req := &dialogflowpb.SearchAgentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SearchAgentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SearchAgentsRequest.
 	}
 	it := c.SearchAgents(ctx, req)
 	for {
@@ -162,7 +162,7 @@ func ExampleAgentsClient_TrainAgent() {
 
 	req := &dialogflowpb.TrainAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#TrainAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#TrainAgentRequest.
 	}
 	op, err := c.TrainAgent(ctx, req)
 	if err != nil {
@@ -190,7 +190,7 @@ func ExampleAgentsClient_ExportAgent() {
 
 	req := &dialogflowpb.ExportAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ExportAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ExportAgentRequest.
 	}
 	op, err := c.ExportAgent(ctx, req)
 	if err != nil {
@@ -220,7 +220,7 @@ func ExampleAgentsClient_ImportAgent() {
 
 	req := &dialogflowpb.ImportAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ImportAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ImportAgentRequest.
 	}
 	op, err := c.ImportAgent(ctx, req)
 	if err != nil {
@@ -248,7 +248,7 @@ func ExampleAgentsClient_RestoreAgent() {
 
 	req := &dialogflowpb.RestoreAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#RestoreAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#RestoreAgentRequest.
 	}
 	op, err := c.RestoreAgent(ctx, req)
 	if err != nil {
@@ -276,7 +276,7 @@ func ExampleAgentsClient_GetValidationResult() {
 
 	req := &dialogflowpb.GetValidationResultRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetValidationResultRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetValidationResultRequest.
 	}
 	resp, err := c.GetValidationResult(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/answer_records_client.go b/dialogflow/apiv2/answer_records_client.go
index 90b78fe6dd3..3430fae6202 100644
--- a/dialogflow/apiv2/answer_records_client.go
+++ b/dialogflow/apiv2/answer_records_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/answer_records_client_example_test.go b/dialogflow/apiv2/answer_records_client_example_test.go
index 3e5247fffb9..7dccb1f672d 100644
--- a/dialogflow/apiv2/answer_records_client_example_test.go
+++ b/dialogflow/apiv2/answer_records_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleAnswerRecordsClient_ListAnswerRecords() {
 
 	req := &dialogflowpb.ListAnswerRecordsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListAnswerRecordsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListAnswerRecordsRequest.
 	}
 	it := c.ListAnswerRecords(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleAnswerRecordsClient_UpdateAnswerRecord() {
 
 	req := &dialogflowpb.UpdateAnswerRecordRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateAnswerRecordRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateAnswerRecordRequest.
 	}
 	resp, err := c.UpdateAnswerRecord(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/contexts_client.go b/dialogflow/apiv2/contexts_client.go
index add5bad7e62..d68ac78d850 100644
--- a/dialogflow/apiv2/contexts_client.go
+++ b/dialogflow/apiv2/contexts_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/contexts_client_example_test.go b/dialogflow/apiv2/contexts_client_example_test.go
index 3986e9dbd7a..90176288c83 100644
--- a/dialogflow/apiv2/contexts_client_example_test.go
+++ b/dialogflow/apiv2/contexts_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleContextsClient_ListContexts() {
 
 	req := &dialogflowpb.ListContextsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListContextsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListContextsRequest.
 	}
 	it := c.ListContexts(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleContextsClient_GetContext() {
 
 	req := &dialogflowpb.GetContextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetContextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetContextRequest.
 	}
 	resp, err := c.GetContext(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleContextsClient_CreateContext() {
 
 	req := &dialogflowpb.CreateContextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateContextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateContextRequest.
 	}
 	resp, err := c.CreateContext(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleContextsClient_UpdateContext() {
 
 	req := &dialogflowpb.UpdateContextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateContextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateContextRequest.
 	}
 	resp, err := c.UpdateContext(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleContextsClient_DeleteContext() {
 
 	req := &dialogflowpb.DeleteContextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteContextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteContextRequest.
 	}
 	err = c.DeleteContext(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleContextsClient_DeleteAllContexts() {
 
 	req := &dialogflowpb.DeleteAllContextsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteAllContextsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteAllContextsRequest.
 	}
 	err = c.DeleteAllContexts(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/conversation_datasets_client.go b/dialogflow/apiv2/conversation_datasets_client.go
index 80b1bd13ca2..63d0746d9b1 100644
--- a/dialogflow/apiv2/conversation_datasets_client.go
+++ b/dialogflow/apiv2/conversation_datasets_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/conversation_datasets_client_example_test.go b/dialogflow/apiv2/conversation_datasets_client_example_test.go
index 54b60f51902..4e989da290e 100644
--- a/dialogflow/apiv2/conversation_datasets_client_example_test.go
+++ b/dialogflow/apiv2/conversation_datasets_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleConversationDatasetsClient_CreateConversationDataset() {
 
 	req := &dialogflowpb.CreateConversationDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationDatasetRequest.
 	}
 	op, err := c.CreateConversationDataset(ctx, req)
 	if err != nil {
@@ -88,7 +88,7 @@ func ExampleConversationDatasetsClient_GetConversationDataset() {
 
 	req := &dialogflowpb.GetConversationDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationDatasetRequest.
 	}
 	resp, err := c.GetConversationDataset(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleConversationDatasetsClient_ListConversationDatasets() {
 
 	req := &dialogflowpb.ListConversationDatasetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationDatasetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationDatasetsRequest.
 	}
 	it := c.ListConversationDatasets(ctx, req)
 	for {
@@ -144,7 +144,7 @@ func ExampleConversationDatasetsClient_DeleteConversationDataset() {
 
 	req := &dialogflowpb.DeleteConversationDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteConversationDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteConversationDatasetRequest.
 	}
 	op, err := c.DeleteConversationDataset(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleConversationDatasetsClient_ImportConversationData() {
 
 	req := &dialogflowpb.ImportConversationDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ImportConversationDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ImportConversationDataRequest.
 	}
 	op, err := c.ImportConversationData(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/conversation_models_client.go b/dialogflow/apiv2/conversation_models_client.go
index aa233f352eb..3a955e0a512 100644
--- a/dialogflow/apiv2/conversation_models_client.go
+++ b/dialogflow/apiv2/conversation_models_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/conversation_models_client_example_test.go b/dialogflow/apiv2/conversation_models_client_example_test.go
index 369014cda6e..ca8d7096c39 100644
--- a/dialogflow/apiv2/conversation_models_client_example_test.go
+++ b/dialogflow/apiv2/conversation_models_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleConversationModelsClient_CreateConversationModel() {
 
 	req := &dialogflowpb.CreateConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationModelRequest.
 	}
 	op, err := c.CreateConversationModel(ctx, req)
 	if err != nil {
@@ -88,7 +88,7 @@ func ExampleConversationModelsClient_GetConversationModel() {
 
 	req := &dialogflowpb.GetConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationModelRequest.
 	}
 	resp, err := c.GetConversationModel(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleConversationModelsClient_ListConversationModels() {
 
 	req := &dialogflowpb.ListConversationModelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationModelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationModelsRequest.
 	}
 	it := c.ListConversationModels(ctx, req)
 	for {
@@ -144,7 +144,7 @@ func ExampleConversationModelsClient_DeleteConversationModel() {
 
 	req := &dialogflowpb.DeleteConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteConversationModelRequest.
 	}
 	op, err := c.DeleteConversationModel(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleConversationModelsClient_DeployConversationModel() {
 
 	req := &dialogflowpb.DeployConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeployConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeployConversationModelRequest.
 	}
 	op, err := c.DeployConversationModel(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleConversationModelsClient_UndeployConversationModel() {
 
 	req := &dialogflowpb.UndeployConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UndeployConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UndeployConversationModelRequest.
 	}
 	op, err := c.UndeployConversationModel(ctx, req)
 	if err != nil {
@@ -228,7 +228,7 @@ func ExampleConversationModelsClient_GetConversationModelEvaluation() {
 
 	req := &dialogflowpb.GetConversationModelEvaluationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationModelEvaluationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationModelEvaluationRequest.
 	}
 	resp, err := c.GetConversationModelEvaluation(ctx, req)
 	if err != nil {
@@ -253,7 +253,7 @@ func ExampleConversationModelsClient_ListConversationModelEvaluations() {
 
 	req := &dialogflowpb.ListConversationModelEvaluationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationModelEvaluationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationModelEvaluationsRequest.
 	}
 	it := c.ListConversationModelEvaluations(ctx, req)
 	for {
@@ -284,7 +284,7 @@ func ExampleConversationModelsClient_CreateConversationModelEvaluation() {
 
 	req := &dialogflowpb.CreateConversationModelEvaluationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationModelEvaluationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationModelEvaluationRequest.
 	}
 	op, err := c.CreateConversationModelEvaluation(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/conversation_profiles_client.go b/dialogflow/apiv2/conversation_profiles_client.go
index deae05c8c18..f957c146ff7 100644
--- a/dialogflow/apiv2/conversation_profiles_client.go
+++ b/dialogflow/apiv2/conversation_profiles_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/conversation_profiles_client_example_test.go b/dialogflow/apiv2/conversation_profiles_client_example_test.go
index d2f2a51a71d..55194c23525 100644
--- a/dialogflow/apiv2/conversation_profiles_client_example_test.go
+++ b/dialogflow/apiv2/conversation_profiles_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleConversationProfilesClient_ListConversationProfiles() {
 
 	req := &dialogflowpb.ListConversationProfilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationProfilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationProfilesRequest.
 	}
 	it := c.ListConversationProfiles(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleConversationProfilesClient_GetConversationProfile() {
 
 	req := &dialogflowpb.GetConversationProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationProfileRequest.
 	}
 	resp, err := c.GetConversationProfile(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleConversationProfilesClient_CreateConversationProfile() {
 
 	req := &dialogflowpb.CreateConversationProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationProfileRequest.
 	}
 	resp, err := c.CreateConversationProfile(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleConversationProfilesClient_UpdateConversationProfile() {
 
 	req := &dialogflowpb.UpdateConversationProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateConversationProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateConversationProfileRequest.
 	}
 	resp, err := c.UpdateConversationProfile(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleConversationProfilesClient_DeleteConversationProfile() {
 
 	req := &dialogflowpb.DeleteConversationProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteConversationProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteConversationProfileRequest.
 	}
 	err = c.DeleteConversationProfile(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleConversationProfilesClient_SetSuggestionFeatureConfig() {
 
 	req := &dialogflowpb.SetSuggestionFeatureConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SetSuggestionFeatureConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SetSuggestionFeatureConfigRequest.
 	}
 	op, err := c.SetSuggestionFeatureConfig(ctx, req)
 	if err != nil {
@@ -217,7 +217,7 @@ func ExampleConversationProfilesClient_ClearSuggestionFeatureConfig() {
 
 	req := &dialogflowpb.ClearSuggestionFeatureConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ClearSuggestionFeatureConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ClearSuggestionFeatureConfigRequest.
 	}
 	op, err := c.ClearSuggestionFeatureConfig(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/conversations_client.go b/dialogflow/apiv2/conversations_client.go
index db4909cad03..ac2e960ec24 100644
--- a/dialogflow/apiv2/conversations_client.go
+++ b/dialogflow/apiv2/conversations_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/conversations_client_example_test.go b/dialogflow/apiv2/conversations_client_example_test.go
index 2414b5aa607..38c40a577eb 100644
--- a/dialogflow/apiv2/conversations_client_example_test.go
+++ b/dialogflow/apiv2/conversations_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleConversationsClient_CreateConversation() {
 
 	req := &dialogflowpb.CreateConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationRequest.
 	}
 	resp, err := c.CreateConversation(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleConversationsClient_ListConversations() {
 
 	req := &dialogflowpb.ListConversationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationsRequest.
 	}
 	it := c.ListConversations(ctx, req)
 	for {
@@ -114,7 +114,7 @@ func ExampleConversationsClient_GetConversation() {
 
 	req := &dialogflowpb.GetConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationRequest.
 	}
 	resp, err := c.GetConversation(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleConversationsClient_CompleteConversation() {
 
 	req := &dialogflowpb.CompleteConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CompleteConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CompleteConversationRequest.
 	}
 	resp, err := c.CompleteConversation(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleConversationsClient_ListMessages() {
 
 	req := &dialogflowpb.ListMessagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListMessagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListMessagesRequest.
 	}
 	it := c.ListMessages(ctx, req)
 	for {
diff --git a/dialogflow/apiv2/dialogflowpb/agent.pb.go b/dialogflow/apiv2/dialogflowpb/agent.pb.go
index 8826f0f072b..0a88a73582d 100644
--- a/dialogflow/apiv2/dialogflowpb/agent.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/agent.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/agent.proto
 
 package dialogflowpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -455,7 +455,7 @@ type SetAgentRequest struct {
 	// Required. The agent to update.
 	Agent *Agent `protobuf:"bytes,1,opt,name=agent,proto3" json:"agent,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *SetAgentRequest) Reset() {
@@ -497,7 +497,7 @@ func (x *SetAgentRequest) GetAgent() *Agent {
 	return nil
 }
 
-func (x *SetAgentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *SetAgentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1518,8 +1518,8 @@ var file_google_cloud_dialogflow_v2_agent_proto_goTypes = []interface{}{
 	(*ImportAgentRequest)(nil),         // 12: google.cloud.dialogflow.v2.ImportAgentRequest
 	(*RestoreAgentRequest)(nil),        // 13: google.cloud.dialogflow.v2.RestoreAgentRequest
 	(*GetValidationResultRequest)(nil), // 14: google.cloud.dialogflow.v2.GetValidationResultRequest
-	(*field_mask.FieldMask)(nil),       // 15: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                // 16: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),      // 15: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),              // 16: google.protobuf.Empty
 	(*longrunning.Operation)(nil),      // 17: google.longrunning.Operation
 	(*ValidationResult)(nil),           // 18: google.cloud.dialogflow.v2.ValidationResult
 }
@@ -1761,7 +1761,7 @@ type AgentsClient interface {
 	// documentation](https://cloud.google.com/dialogflow/es/docs/training).
 	SetAgent(ctx context.Context, in *SetAgentRequest, opts ...grpc.CallOption) (*Agent, error)
 	// Deletes the specified agent.
-	DeleteAgent(ctx context.Context, in *DeleteAgentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAgent(ctx context.Context, in *DeleteAgentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Returns the list of agents.
 	//
 	// Since there is at most one conversational agent per project, this method is
@@ -1877,8 +1877,8 @@ func (c *agentsClient) SetAgent(ctx context.Context, in *SetAgentRequest, opts .
 	return out, nil
 }
 
-func (c *agentsClient) DeleteAgent(ctx context.Context, in *DeleteAgentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *agentsClient) DeleteAgent(ctx context.Context, in *DeleteAgentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Agents/DeleteAgent", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1951,7 +1951,7 @@ type AgentsServer interface {
 	// documentation](https://cloud.google.com/dialogflow/es/docs/training).
 	SetAgent(context.Context, *SetAgentRequest) (*Agent, error)
 	// Deletes the specified agent.
-	DeleteAgent(context.Context, *DeleteAgentRequest) (*empty.Empty, error)
+	DeleteAgent(context.Context, *DeleteAgentRequest) (*emptypb.Empty, error)
 	// Returns the list of agents.
 	//
 	// Since there is at most one conversational agent per project, this method is
@@ -2051,7 +2051,7 @@ func (*UnimplementedAgentsServer) GetAgent(context.Context, *GetAgentRequest) (*
 func (*UnimplementedAgentsServer) SetAgent(context.Context, *SetAgentRequest) (*Agent, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetAgent not implemented")
 }
-func (*UnimplementedAgentsServer) DeleteAgent(context.Context, *DeleteAgentRequest) (*empty.Empty, error) {
+func (*UnimplementedAgentsServer) DeleteAgent(context.Context, *DeleteAgentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAgent not implemented")
 }
 func (*UnimplementedAgentsServer) SearchAgents(context.Context, *SearchAgentsRequest) (*SearchAgentsResponse, error) {
diff --git a/dialogflow/apiv2/dialogflowpb/answer_record.pb.go b/dialogflow/apiv2/dialogflowpb/answer_record.pb.go
index 16525e5ce95..0ffdfd25b52 100644
--- a/dialogflow/apiv2/dialogflowpb/answer_record.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/answer_record.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/answer_record.proto
 
 package dialogflowpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -539,7 +539,7 @@ type UpdateAnswerRecordRequest struct {
 	// Required. Answer record to update.
 	AnswerRecord *AnswerRecord `protobuf:"bytes,1,opt,name=answer_record,json=answerRecord,proto3" json:"answer_record,omitempty"`
 	// Required. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAnswerRecordRequest) Reset() {
@@ -581,7 +581,7 @@ func (x *UpdateAnswerRecordRequest) GetAnswerRecord() *AnswerRecord {
 	return nil
 }
 
-func (x *UpdateAnswerRecordRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAnswerRecordRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -607,12 +607,12 @@ type AnswerFeedback struct {
 	// or not. Default to false.
 	Clicked bool `protobuf:"varint,3,opt,name=clicked,proto3" json:"clicked,omitempty"`
 	// Time when the answer/item was clicked.
-	ClickTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=click_time,json=clickTime,proto3" json:"click_time,omitempty"`
+	ClickTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=click_time,json=clickTime,proto3" json:"click_time,omitempty"`
 	// Indicates whether the answer/item was displayed to the human
 	// agent in the agent desktop UI. Default to false.
 	Displayed bool `protobuf:"varint,4,opt,name=displayed,proto3" json:"displayed,omitempty"`
 	// Time when the answer/item was displayed.
-	DisplayTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=display_time,json=displayTime,proto3" json:"display_time,omitempty"`
+	DisplayTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=display_time,json=displayTime,proto3" json:"display_time,omitempty"`
 }
 
 func (x *AnswerFeedback) Reset() {
@@ -675,7 +675,7 @@ func (x *AnswerFeedback) GetClicked() bool {
 	return false
 }
 
-func (x *AnswerFeedback) GetClickTime() *timestamp.Timestamp {
+func (x *AnswerFeedback) GetClickTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ClickTime
 	}
@@ -689,7 +689,7 @@ func (x *AnswerFeedback) GetDisplayed() bool {
 	return false
 }
 
-func (x *AnswerFeedback) GetDisplayTime() *timestamp.Timestamp {
+func (x *AnswerFeedback) GetDisplayTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DisplayTime
 	}
@@ -1132,8 +1132,8 @@ var file_google_cloud_dialogflow_v2_answer_record_proto_goTypes = []interface{}{
 	(*AnswerFeedback)(nil),                          // 8: google.cloud.dialogflow.v2.AnswerFeedback
 	(*AgentAssistantFeedback)(nil),                  // 9: google.cloud.dialogflow.v2.AgentAssistantFeedback
 	(*AgentAssistantRecord)(nil),                    // 10: google.cloud.dialogflow.v2.AgentAssistantRecord
-	(*field_mask.FieldMask)(nil),                    // 11: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),                     // 12: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                   // 11: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                   // 12: google.protobuf.Timestamp
 	(*ArticleAnswer)(nil),                           // 13: google.cloud.dialogflow.v2.ArticleAnswer
 	(*FaqAnswer)(nil),                               // 14: google.cloud.dialogflow.v2.FaqAnswer
 }
diff --git a/dialogflow/apiv2/dialogflowpb/audio_config.pb.go b/dialogflow/apiv2/dialogflowpb/audio_config.pb.go
index 50a4eaa9064..3d1f391464c 100644
--- a/dialogflow/apiv2/dialogflowpb/audio_config.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/audio_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/audio_config.proto
 
 package dialogflowpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -435,11 +435,11 @@ type SpeechWordInfo struct {
 	// Time offset relative to the beginning of the audio that corresponds to the
 	// start of the spoken word. This is an experimental feature and the accuracy
 	// of the time offset can vary.
-	StartOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_offset,json=startOffset,proto3" json:"start_offset,omitempty"`
+	StartOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=start_offset,json=startOffset,proto3" json:"start_offset,omitempty"`
 	// Time offset relative to the beginning of the audio that corresponds to the
 	// end of the spoken word. This is an experimental feature and the accuracy of
 	// the time offset can vary.
-	EndOffset *duration.Duration `protobuf:"bytes,2,opt,name=end_offset,json=endOffset,proto3" json:"end_offset,omitempty"`
+	EndOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=end_offset,json=endOffset,proto3" json:"end_offset,omitempty"`
 	// The Speech confidence between 0.0 and 1.0 for this word. A higher number
 	// indicates an estimated greater likelihood that the recognized word is
 	// correct. The default of 0.0 is a sentinel value indicating that confidence
@@ -489,14 +489,14 @@ func (x *SpeechWordInfo) GetWord() string {
 	return ""
 }
 
-func (x *SpeechWordInfo) GetStartOffset() *duration.Duration {
+func (x *SpeechWordInfo) GetStartOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartOffset
 	}
 	return nil
 }
 
-func (x *SpeechWordInfo) GetEndOffset() *duration.Duration {
+func (x *SpeechWordInfo) GetEndOffset() *durationpb.Duration {
 	if x != nil {
 		return x.EndOffset
 	}
@@ -1191,7 +1191,7 @@ var file_google_cloud_dialogflow_v2_audio_config_proto_goTypes = []interface{}{
 	(*SynthesizeSpeechConfig)(nil), // 8: google.cloud.dialogflow.v2.SynthesizeSpeechConfig
 	(*OutputAudioConfig)(nil),      // 9: google.cloud.dialogflow.v2.OutputAudioConfig
 	(*SpeechToTextConfig)(nil),     // 10: google.cloud.dialogflow.v2.SpeechToTextConfig
-	(*duration.Duration)(nil),      // 11: google.protobuf.Duration
+	(*durationpb.Duration)(nil),    // 11: google.protobuf.Duration
 }
 var file_google_cloud_dialogflow_v2_audio_config_proto_depIdxs = []int32{
 	11, // 0: google.cloud.dialogflow.v2.SpeechWordInfo.start_offset:type_name -> google.protobuf.Duration
diff --git a/dialogflow/apiv2/dialogflowpb/context.pb.go b/dialogflow/apiv2/dialogflowpb/context.pb.go
index 0d31a717315..4453626f9b2 100644
--- a/dialogflow/apiv2/dialogflowpb/context.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/context.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/context.proto
 
 package dialogflowpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -103,7 +103,7 @@ type Context struct {
 	//   - If parameter's entity type is a composite entity:
 	//     map from composite entity property names to property values
 	//   - Else: parameter value
-	Parameters *_struct.Struct `protobuf:"bytes,3,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	Parameters *structpb.Struct `protobuf:"bytes,3,opt,name=parameters,proto3" json:"parameters,omitempty"`
 }
 
 func (x *Context) Reset() {
@@ -152,7 +152,7 @@ func (x *Context) GetLifespanCount() int32 {
 	return 0
 }
 
-func (x *Context) GetParameters() *_struct.Struct {
+func (x *Context) GetParameters() *structpb.Struct {
 	if x != nil {
 		return x.Parameters
 	}
@@ -418,7 +418,7 @@ type UpdateContextRequest struct {
 	// Required. The context to update.
 	Context *Context `protobuf:"bytes,1,opt,name=context,proto3" json:"context,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateContextRequest) Reset() {
@@ -460,7 +460,7 @@ func (x *UpdateContextRequest) GetContext() *Context {
 	return nil
 }
 
-func (x *UpdateContextRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateContextRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -887,9 +887,9 @@ var file_google_cloud_dialogflow_v2_context_proto_goTypes = []interface{}{
 	(*UpdateContextRequest)(nil),     // 5: google.cloud.dialogflow.v2.UpdateContextRequest
 	(*DeleteContextRequest)(nil),     // 6: google.cloud.dialogflow.v2.DeleteContextRequest
 	(*DeleteAllContextsRequest)(nil), // 7: google.cloud.dialogflow.v2.DeleteAllContextsRequest
-	(*_struct.Struct)(nil),           // 8: google.protobuf.Struct
-	(*field_mask.FieldMask)(nil),     // 9: google.protobuf.FieldMask
-	(*empty.Empty)(nil),              // 10: google.protobuf.Empty
+	(*structpb.Struct)(nil),          // 8: google.protobuf.Struct
+	(*fieldmaskpb.FieldMask)(nil),    // 9: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),            // 10: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_v2_context_proto_depIdxs = []int32{
 	8,  // 0: google.cloud.dialogflow.v2.Context.parameters:type_name -> google.protobuf.Struct
@@ -1062,9 +1062,9 @@ type ContextsClient interface {
 	// Updates the specified context.
 	UpdateContext(ctx context.Context, in *UpdateContextRequest, opts ...grpc.CallOption) (*Context, error)
 	// Deletes the specified context.
-	DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Deletes all active contexts in the specified session.
-	DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type contextsClient struct {
@@ -1111,8 +1111,8 @@ func (c *contextsClient) UpdateContext(ctx context.Context, in *UpdateContextReq
 	return out, nil
 }
 
-func (c *contextsClient) DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *contextsClient) DeleteContext(ctx context.Context, in *DeleteContextRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Contexts/DeleteContext", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1120,8 +1120,8 @@ func (c *contextsClient) DeleteContext(ctx context.Context, in *DeleteContextReq
 	return out, nil
 }
 
-func (c *contextsClient) DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *contextsClient) DeleteAllContexts(ctx context.Context, in *DeleteAllContextsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Contexts/DeleteAllContexts", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1142,9 +1142,9 @@ type ContextsServer interface {
 	// Updates the specified context.
 	UpdateContext(context.Context, *UpdateContextRequest) (*Context, error)
 	// Deletes the specified context.
-	DeleteContext(context.Context, *DeleteContextRequest) (*empty.Empty, error)
+	DeleteContext(context.Context, *DeleteContextRequest) (*emptypb.Empty, error)
 	// Deletes all active contexts in the specified session.
-	DeleteAllContexts(context.Context, *DeleteAllContextsRequest) (*empty.Empty, error)
+	DeleteAllContexts(context.Context, *DeleteAllContextsRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedContextsServer can be embedded to have forward compatible implementations.
@@ -1163,10 +1163,10 @@ func (*UnimplementedContextsServer) CreateContext(context.Context, *CreateContex
 func (*UnimplementedContextsServer) UpdateContext(context.Context, *UpdateContextRequest) (*Context, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateContext not implemented")
 }
-func (*UnimplementedContextsServer) DeleteContext(context.Context, *DeleteContextRequest) (*empty.Empty, error) {
+func (*UnimplementedContextsServer) DeleteContext(context.Context, *DeleteContextRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteContext not implemented")
 }
-func (*UnimplementedContextsServer) DeleteAllContexts(context.Context, *DeleteAllContextsRequest) (*empty.Empty, error) {
+func (*UnimplementedContextsServer) DeleteAllContexts(context.Context, *DeleteAllContextsRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAllContexts not implemented")
 }
 
diff --git a/dialogflow/apiv2/dialogflowpb/conversation.pb.go b/dialogflow/apiv2/dialogflowpb/conversation.pb.go
index db1786e1e3e..50d5b6c3e04 100644
--- a/dialogflow/apiv2/dialogflowpb/conversation.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/conversation.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/conversation.proto
 
 package dialogflowpb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -176,9 +176,9 @@ type Conversation struct {
 	// telephony.
 	PhoneNumber *ConversationPhoneNumber `protobuf:"bytes,4,opt,name=phone_number,json=phoneNumber,proto3" json:"phone_number,omitempty"`
 	// Output only. The time the conversation was started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. The time the conversation was finished.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The stage of a conversation. It indicates whether the virtual agent or a
 	// human agent is handling the conversation.
 	//
@@ -255,14 +255,14 @@ func (x *Conversation) GetPhoneNumber() *ConversationPhoneNumber {
 	return nil
 }
 
-func (x *Conversation) GetStartTime() *timestamp.Timestamp {
+func (x *Conversation) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Conversation) GetEndTime() *timestamp.Timestamp {
+func (x *Conversation) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1083,7 +1083,7 @@ var file_google_cloud_dialogflow_v2_conversation_proto_goTypes = []interface{}{
 	(*ListMessagesRequest)(nil),         // 8: google.cloud.dialogflow.v2.ListMessagesRequest
 	(*ListMessagesResponse)(nil),        // 9: google.cloud.dialogflow.v2.ListMessagesResponse
 	(*ConversationPhoneNumber)(nil),     // 10: google.cloud.dialogflow.v2.ConversationPhoneNumber
-	(*timestamp.Timestamp)(nil),         // 11: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),       // 11: google.protobuf.Timestamp
 	(*Message)(nil),                     // 12: google.cloud.dialogflow.v2.Message
 }
 var file_google_cloud_dialogflow_v2_conversation_proto_depIdxs = []int32{
diff --git a/dialogflow/apiv2/dialogflowpb/conversation_dataset.pb.go b/dialogflow/apiv2/dialogflowpb/conversation_dataset.pb.go
index 2b9dbe555cc..056d8308b9b 100644
--- a/dialogflow/apiv2/dialogflowpb/conversation_dataset.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/conversation_dataset.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/conversation_dataset.proto
 
 package dialogflowpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -34,6 +33,7 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -186,7 +186,7 @@ type ConversationDataset struct {
 	// Optional. The description of the dataset. Maximum of 10000 bytes.
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. Creation time of this dataset.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Input configurations set during conversation data import.
 	InputConfig *InputConfig `protobuf:"bytes,5,opt,name=input_config,json=inputConfig,proto3" json:"input_config,omitempty"`
 	// Output only. Metadata set during conversation data import.
@@ -248,7 +248,7 @@ func (x *ConversationDataset) GetDescription() string {
 	return ""
 }
 
-func (x *ConversationDataset) GetCreateTime() *timestamp.Timestamp {
+func (x *ConversationDataset) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -645,7 +645,7 @@ type ImportConversationDataOperationMetadata struct {
 	PartialFailures []*status.Status `protobuf:"bytes,2,rep,name=partial_failures,json=partialFailures,proto3" json:"partial_failures,omitempty"`
 	// Timestamp when import conversation data request was created. The time is
 	// measured on server side.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *ImportConversationDataOperationMetadata) Reset() {
@@ -694,7 +694,7 @@ func (x *ImportConversationDataOperationMetadata) GetPartialFailures() []*status
 	return nil
 }
 
-func (x *ImportConversationDataOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *ImportConversationDataOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1164,7 +1164,7 @@ var file_google_cloud_dialogflow_v2_conversation_dataset_proto_goTypes = []inter
 	(*CreateConversationDatasetOperationMetadata)(nil), // 11: google.cloud.dialogflow.v2.CreateConversationDatasetOperationMetadata
 	(*DeleteConversationDatasetOperationMetadata)(nil), // 12: google.cloud.dialogflow.v2.DeleteConversationDatasetOperationMetadata
 	(*GcsSources)(nil),                                 // 13: google.cloud.dialogflow.v2.GcsSources
-	(*timestamp.Timestamp)(nil),                        // 14: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                      // 14: google.protobuf.Timestamp
 	(*status.Status)(nil),                              // 15: google.rpc.Status
 	(*longrunning.Operation)(nil),                      // 16: google.longrunning.Operation
 }
diff --git a/dialogflow/apiv2/dialogflowpb/conversation_event.pb.go b/dialogflow/apiv2/dialogflowpb/conversation_event.pb.go
index 8db43259c6a..9da8c5aca30 100644
--- a/dialogflow/apiv2/dialogflowpb/conversation_event.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/conversation_event.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/conversation_event.proto
 
 package dialogflowpb
diff --git a/dialogflow/apiv2/dialogflowpb/conversation_model.pb.go b/dialogflow/apiv2/dialogflowpb/conversation_model.pb.go
index f5b69b88364..2a52135a7fe 100644
--- a/dialogflow/apiv2/dialogflowpb/conversation_model.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/conversation_model.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/conversation_model.proto
 
 package dialogflowpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -322,7 +322,7 @@ type ConversationModel struct {
 	// Required. The display name of the model. At most 64 bytes long.
 	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only. Creation time of this model.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Required. Datasets used to create model.
 	Datasets []*InputDataset `protobuf:"bytes,4,rep,name=datasets,proto3" json:"datasets,omitempty"`
 	// Output only. State of the model. A model can only serve prediction requests
@@ -391,7 +391,7 @@ func (x *ConversationModel) GetDisplayName() string {
 	return ""
 }
 
-func (x *ConversationModel) GetCreateTime() *timestamp.Timestamp {
+func (x *ConversationModel) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -473,7 +473,7 @@ type ConversationModelEvaluation struct {
 	// Optional. The configuration of the evaluation task.
 	EvaluationConfig *EvaluationConfig `protobuf:"bytes,6,opt,name=evaluation_config,json=evaluationConfig,proto3" json:"evaluation_config,omitempty"`
 	// Output only. Creation time of this model.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Metrics details.
 	//
 	// Types that are assignable to Metrics:
@@ -535,7 +535,7 @@ func (x *ConversationModelEvaluation) GetEvaluationConfig() *EvaluationConfig {
 	return nil
 }
 
-func (x *ConversationModelEvaluation) GetCreateTime() *timestamp.Timestamp {
+func (x *ConversationModelEvaluation) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1531,7 +1531,7 @@ type CreateConversationModelOperationMetadata struct {
 	State CreateConversationModelOperationMetadata_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.cloud.dialogflow.v2.CreateConversationModelOperationMetadata_State" json:"state,omitempty"`
 	// Timestamp when the request to create conversation model is submitted. The
 	// time is measured on server side.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *CreateConversationModelOperationMetadata) Reset() {
@@ -1580,7 +1580,7 @@ func (x *CreateConversationModelOperationMetadata) GetState() CreateConversation
 	return CreateConversationModelOperationMetadata_STATE_UNSPECIFIED
 }
 
-func (x *CreateConversationModelOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *CreateConversationModelOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1598,7 +1598,7 @@ type DeployConversationModelOperationMetadata struct {
 	ConversationModel string `protobuf:"bytes,1,opt,name=conversation_model,json=conversationModel,proto3" json:"conversation_model,omitempty"`
 	// Timestamp when request to deploy conversation model was submitted. The time
 	// is measured on server side.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *DeployConversationModelOperationMetadata) Reset() {
@@ -1640,7 +1640,7 @@ func (x *DeployConversationModelOperationMetadata) GetConversationModel() string
 	return ""
 }
 
-func (x *DeployConversationModelOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *DeployConversationModelOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1658,7 +1658,7 @@ type UndeployConversationModelOperationMetadata struct {
 	ConversationModel string `protobuf:"bytes,1,opt,name=conversation_model,json=conversationModel,proto3" json:"conversation_model,omitempty"`
 	// Timestamp when the request to undeploy conversation model was submitted.
 	// The time is measured on server side.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *UndeployConversationModelOperationMetadata) Reset() {
@@ -1700,7 +1700,7 @@ func (x *UndeployConversationModelOperationMetadata) GetConversationModel() stri
 	return ""
 }
 
-func (x *UndeployConversationModelOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *UndeployConversationModelOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1718,7 +1718,7 @@ type DeleteConversationModelOperationMetadata struct {
 	ConversationModel string `protobuf:"bytes,1,opt,name=conversation_model,json=conversationModel,proto3" json:"conversation_model,omitempty"`
 	// Timestamp when delete conversation model request was created. The time is
 	// measured on server side.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *DeleteConversationModelOperationMetadata) Reset() {
@@ -1760,7 +1760,7 @@ func (x *DeleteConversationModelOperationMetadata) GetConversationModel() string
 	return ""
 }
 
-func (x *DeleteConversationModelOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *DeleteConversationModelOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1787,7 +1787,7 @@ type CreateConversationModelEvaluationOperationMetadata struct {
 	State CreateConversationModelEvaluationOperationMetadata_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.cloud.dialogflow.v2.CreateConversationModelEvaluationOperationMetadata_State" json:"state,omitempty"`
 	// Timestamp when the request to create conversation model was submitted. The
 	// time is measured on server side.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *CreateConversationModelEvaluationOperationMetadata) Reset() {
@@ -1843,7 +1843,7 @@ func (x *CreateConversationModelEvaluationOperationMetadata) GetState() CreateCo
 	return CreateConversationModelEvaluationOperationMetadata_STATE_UNSPECIFIED
 }
 
-func (x *CreateConversationModelEvaluationOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *CreateConversationModelEvaluationOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -2654,7 +2654,7 @@ var file_google_cloud_dialogflow_v2_conversation_model_proto_goTypes = []interfa
 	(*EvaluationConfig_SmartReplyConfig)(nil),                     // 27: google.cloud.dialogflow.v2.EvaluationConfig.SmartReplyConfig
 	(*EvaluationConfig_SmartComposeConfig)(nil),                   // 28: google.cloud.dialogflow.v2.EvaluationConfig.SmartComposeConfig
 	(*SmartReplyMetrics_TopNMetrics)(nil),                         // 29: google.cloud.dialogflow.v2.SmartReplyMetrics.TopNMetrics
-	(*timestamp.Timestamp)(nil),                                   // 30: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                                 // 30: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),                                 // 31: google.longrunning.Operation
 }
 var file_google_cloud_dialogflow_v2_conversation_model_proto_depIdxs = []int32{
diff --git a/dialogflow/apiv2/dialogflowpb/conversation_profile.pb.go b/dialogflow/apiv2/dialogflowpb/conversation_profile.pb.go
index fbcc45921f1..728a5a792e3 100644
--- a/dialogflow/apiv2/dialogflowpb/conversation_profile.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/conversation_profile.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/conversation_profile.proto
 
 package dialogflowpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -167,9 +167,9 @@ type ConversationProfile struct {
 	// Required. Human readable name for this profile. Max length 1024 bytes.
 	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only. Create time of the conversation profile.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Update time of the conversation profile.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Configuration for an automated agent to use with this profile.
 	AutomatedAgentConfig *AutomatedAgentConfig `protobuf:"bytes,3,opt,name=automated_agent_config,json=automatedAgentConfig,proto3" json:"automated_agent_config,omitempty"`
 	// Configuration for agent assistance to use with this profile.
@@ -250,14 +250,14 @@ func (x *ConversationProfile) GetDisplayName() string {
 	return ""
 }
 
-func (x *ConversationProfile) GetCreateTime() *timestamp.Timestamp {
+func (x *ConversationProfile) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ConversationProfile) GetUpdateTime() *timestamp.Timestamp {
+func (x *ConversationProfile) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -582,7 +582,7 @@ type UpdateConversationProfileRequest struct {
 	// Required. The conversation profile to update.
 	ConversationProfile *ConversationProfile `protobuf:"bytes,1,opt,name=conversation_profile,json=conversationProfile,proto3" json:"conversation_profile,omitempty"`
 	// Required. The mask to control which fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateConversationProfileRequest) Reset() {
@@ -624,7 +624,7 @@ func (x *UpdateConversationProfileRequest) GetConversationProfile() *Conversatio
 	return nil
 }
 
-func (x *UpdateConversationProfileRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateConversationProfileRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1252,7 +1252,7 @@ type SetSuggestionFeatureConfigOperationMetadata struct {
 	// Required. The type of the suggestion feature to add or update.
 	SuggestionFeatureType SuggestionFeature_Type `protobuf:"varint,3,opt,name=suggestion_feature_type,json=suggestionFeatureType,proto3,enum=google.cloud.dialogflow.v2.SuggestionFeature_Type" json:"suggestion_feature_type,omitempty"`
 	// Timestamp whe the request was created. The time is measured on server side.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *SetSuggestionFeatureConfigOperationMetadata) Reset() {
@@ -1308,7 +1308,7 @@ func (x *SetSuggestionFeatureConfigOperationMetadata) GetSuggestionFeatureType()
 	return SuggestionFeature_TYPE_UNSPECIFIED
 }
 
-func (x *SetSuggestionFeatureConfigOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *SetSuggestionFeatureConfigOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1332,7 +1332,7 @@ type ClearSuggestionFeatureConfigOperationMetadata struct {
 	// Required. The type of the suggestion feature to remove.
 	SuggestionFeatureType SuggestionFeature_Type `protobuf:"varint,3,opt,name=suggestion_feature_type,json=suggestionFeatureType,proto3,enum=google.cloud.dialogflow.v2.SuggestionFeature_Type" json:"suggestion_feature_type,omitempty"`
 	// Timestamp whe the request was created. The time is measured on server side.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *ClearSuggestionFeatureConfigOperationMetadata) Reset() {
@@ -1388,7 +1388,7 @@ func (x *ClearSuggestionFeatureConfigOperationMetadata) GetSuggestionFeatureType
 	return SuggestionFeature_TYPE_UNSPECIFIED
 }
 
-func (x *ClearSuggestionFeatureConfigOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *ClearSuggestionFeatureConfigOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -3063,11 +3063,11 @@ var file_google_cloud_dialogflow_v2_conversation_profile_proto_goTypes = []inter
 	(*HumanAgentAssistantConfig_SuggestionQueryConfig_ContextFilterSettings)(nil),    // 29: google.cloud.dialogflow.v2.HumanAgentAssistantConfig.SuggestionQueryConfig.ContextFilterSettings
 	(*HumanAgentHandoffConfig_LivePersonConfig)(nil),                                 // 30: google.cloud.dialogflow.v2.HumanAgentHandoffConfig.LivePersonConfig
 	(*HumanAgentHandoffConfig_SalesforceLiveAgentConfig)(nil),                        // 31: google.cloud.dialogflow.v2.HumanAgentHandoffConfig.SalesforceLiveAgentConfig
-	(*timestamp.Timestamp)(nil),                                                      // 32: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                                                    // 32: google.protobuf.Timestamp
 	(*SpeechToTextConfig)(nil),                                                       // 33: google.cloud.dialogflow.v2.SpeechToTextConfig
-	(*field_mask.FieldMask)(nil),                                                     // 34: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                                                    // 34: google.protobuf.FieldMask
 	(Participant_Role)(0),                                                            // 35: google.cloud.dialogflow.v2.Participant.Role
-	(*empty.Empty)(nil),                                                              // 36: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                                            // 36: google.protobuf.Empty
 	(*longrunning.Operation)(nil),                                                    // 37: google.longrunning.Operation
 }
 var file_google_cloud_dialogflow_v2_conversation_profile_proto_depIdxs = []int32{
@@ -3561,7 +3561,7 @@ type ConversationProfilesClient interface {
 	// [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
 	UpdateConversationProfile(ctx context.Context, in *UpdateConversationProfileRequest, opts ...grpc.CallOption) (*ConversationProfile, error)
 	// Deletes the specified conversation profile.
-	DeleteConversationProfile(ctx context.Context, in *DeleteConversationProfileRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteConversationProfile(ctx context.Context, in *DeleteConversationProfileRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Adds or updates a suggestion feature in a conversation profile.
 	// If the conversation profile contains the type of suggestion feature for
 	// the participant role, it will update it. Otherwise it will insert the
@@ -3635,8 +3635,8 @@ func (c *conversationProfilesClient) UpdateConversationProfile(ctx context.Conte
 	return out, nil
 }
 
-func (c *conversationProfilesClient) DeleteConversationProfile(ctx context.Context, in *DeleteConversationProfileRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *conversationProfilesClient) DeleteConversationProfile(ctx context.Context, in *DeleteConversationProfileRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.ConversationProfiles/DeleteConversationProfile", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3681,7 +3681,7 @@ type ConversationProfilesServer interface {
 	// [GetConversationProfile][google.cloud.dialogflow.v2.ConversationProfiles.GetConversationProfile] API.
 	UpdateConversationProfile(context.Context, *UpdateConversationProfileRequest) (*ConversationProfile, error)
 	// Deletes the specified conversation profile.
-	DeleteConversationProfile(context.Context, *DeleteConversationProfileRequest) (*empty.Empty, error)
+	DeleteConversationProfile(context.Context, *DeleteConversationProfileRequest) (*emptypb.Empty, error)
 	// Adds or updates a suggestion feature in a conversation profile.
 	// If the conversation profile contains the type of suggestion feature for
 	// the participant role, it will update it. Otherwise it will insert the
@@ -3727,7 +3727,7 @@ func (*UnimplementedConversationProfilesServer) CreateConversationProfile(contex
 func (*UnimplementedConversationProfilesServer) UpdateConversationProfile(context.Context, *UpdateConversationProfileRequest) (*ConversationProfile, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateConversationProfile not implemented")
 }
-func (*UnimplementedConversationProfilesServer) DeleteConversationProfile(context.Context, *DeleteConversationProfileRequest) (*empty.Empty, error) {
+func (*UnimplementedConversationProfilesServer) DeleteConversationProfile(context.Context, *DeleteConversationProfileRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteConversationProfile not implemented")
 }
 func (*UnimplementedConversationProfilesServer) SetSuggestionFeatureConfig(context.Context, *SetSuggestionFeatureConfigRequest) (*longrunning.Operation, error) {
diff --git a/dialogflow/apiv2/dialogflowpb/document.pb.go b/dialogflow/apiv2/dialogflowpb/document.pb.go
index 8002a709386..9954f8e4964 100644
--- a/dialogflow/apiv2/dialogflowpb/document.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/document.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/document.proto
 
 package dialogflowpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -995,7 +995,7 @@ type UpdateDocumentRequest struct {
 	// Optional. Not specified means `update all`.
 	// Currently, only `display_name` can be updated, an InvalidArgument will be
 	// returned for attempting to update other fields.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateDocumentRequest) Reset() {
@@ -1037,7 +1037,7 @@ func (x *UpdateDocumentRequest) GetDocument() *Document {
 	return nil
 }
 
-func (x *UpdateDocumentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDocumentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1402,7 +1402,7 @@ type Document_ReloadStatus struct {
 	// The time of a reload attempt.
 	// This reload may have been triggered automatically or manually and may
 	// not have succeeded.
-	Time *timestamp.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
+	Time *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
 	// The status of a reload attempt or the initial load.
 	Status *status.Status `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
 }
@@ -1439,7 +1439,7 @@ func (*Document_ReloadStatus) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dialogflow_v2_document_proto_rawDescGZIP(), []int{0, 0}
 }
 
-func (x *Document_ReloadStatus) GetTime() *timestamp.Timestamp {
+func (x *Document_ReloadStatus) GetTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Time
 	}
@@ -1947,9 +1947,9 @@ var file_google_cloud_dialogflow_v2_document_proto_goTypes = []interface{}{
 	nil,                                   // 19: google.cloud.dialogflow.v2.ImportDocumentTemplate.MetadataEntry
 	(*GcsSources)(nil),                    // 20: google.cloud.dialogflow.v2.GcsSources
 	(*status.Status)(nil),                 // 21: google.rpc.Status
-	(*field_mask.FieldMask)(nil),          // 22: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),         // 22: google.protobuf.FieldMask
 	(*GcsDestination)(nil),                // 23: google.cloud.dialogflow.v2.GcsDestination
-	(*timestamp.Timestamp)(nil),           // 24: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),         // 24: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),         // 25: google.longrunning.Operation
 }
 var file_google_cloud_dialogflow_v2_document_proto_depIdxs = []int32{
diff --git a/dialogflow/apiv2/dialogflowpb/entity_type.pb.go b/dialogflow/apiv2/dialogflowpb/entity_type.pb.go
index 5d7f4a99a05..3870502be9e 100644
--- a/dialogflow/apiv2/dialogflowpb/entity_type.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/entity_type.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/entity_type.proto
 
 package dialogflowpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -557,7 +557,7 @@ type UpdateEntityTypeRequest struct {
 	// data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
 	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateEntityTypeRequest) Reset() {
@@ -606,7 +606,7 @@ func (x *UpdateEntityTypeRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (x *UpdateEntityTypeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEntityTypeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -691,7 +691,7 @@ type BatchUpdateEntityTypesRequest struct {
 	// data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
 	LanguageCode string `protobuf:"bytes,4,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *BatchUpdateEntityTypesRequest) Reset() {
@@ -761,7 +761,7 @@ func (x *BatchUpdateEntityTypesRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (x *BatchUpdateEntityTypesRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *BatchUpdateEntityTypesRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -990,7 +990,7 @@ type BatchUpdateEntitiesRequest struct {
 	// data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
 	LanguageCode string `protobuf:"bytes,3,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *BatchUpdateEntitiesRequest) Reset() {
@@ -1046,7 +1046,7 @@ func (x *BatchUpdateEntitiesRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (x *BatchUpdateEntitiesRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *BatchUpdateEntitiesRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1726,8 +1726,8 @@ var file_google_cloud_dialogflow_v2_entity_type_proto_goTypes = []interface{}{
 	(*BatchDeleteEntitiesRequest)(nil),     // 14: google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest
 	(*EntityTypeBatch)(nil),                // 15: google.cloud.dialogflow.v2.EntityTypeBatch
 	(*EntityType_Entity)(nil),              // 16: google.cloud.dialogflow.v2.EntityType.Entity
-	(*field_mask.FieldMask)(nil),           // 17: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                    // 18: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),          // 17: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                  // 18: google.protobuf.Empty
 	(*longrunning.Operation)(nil),          // 19: google.longrunning.Operation
 }
 var file_google_cloud_dialogflow_v2_entity_type_proto_depIdxs = []int32{
@@ -2017,7 +2017,7 @@ type EntityTypesClient interface {
 	// Note: You should always train an agent prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/es/docs/training).
-	DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates/Creates multiple entity types in the specified agent.
 	//
 	// This method is a [long-running
@@ -2140,8 +2140,8 @@ func (c *entityTypesClient) UpdateEntityType(ctx context.Context, in *UpdateEnti
 	return out, nil
 }
 
-func (c *entityTypesClient) DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *entityTypesClient) DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.EntityTypes/DeleteEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2217,7 +2217,7 @@ type EntityTypesServer interface {
 	// Note: You should always train an agent prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/es/docs/training).
-	DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*empty.Empty, error)
+	DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*emptypb.Empty, error)
 	// Updates/Creates multiple entity types in the specified agent.
 	//
 	// This method is a [long-running
@@ -2312,7 +2312,7 @@ func (*UnimplementedEntityTypesServer) CreateEntityType(context.Context, *Create
 func (*UnimplementedEntityTypesServer) UpdateEntityType(context.Context, *UpdateEntityTypeRequest) (*EntityType, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEntityType not implemented")
 }
-func (*UnimplementedEntityTypesServer) DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*empty.Empty, error) {
+func (*UnimplementedEntityTypesServer) DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEntityType not implemented")
 }
 func (*UnimplementedEntityTypesServer) BatchUpdateEntityTypes(context.Context, *BatchUpdateEntityTypesRequest) (*longrunning.Operation, error) {
diff --git a/dialogflow/apiv2/dialogflowpb/environment.pb.go b/dialogflow/apiv2/dialogflowpb/environment.pb.go
index 655626adccb..4f82346820c 100644
--- a/dialogflow/apiv2/dialogflowpb/environment.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/environment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/environment.proto
 
 package dialogflowpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -151,7 +151,7 @@ type Environment struct {
 	State Environment_State `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.dialogflow.v2.Environment_State" json:"state,omitempty"`
 	// Output only. The last update time of this environment. This field is read-only, i.e., it
 	// cannot be set by create and update methods.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Text to speech settings for this environment.
 	TextToSpeechSettings *TextToSpeechSettings `protobuf:"bytes,7,opt,name=text_to_speech_settings,json=textToSpeechSettings,proto3" json:"text_to_speech_settings,omitempty"`
 	// Optional. The fulfillment settings to use for this environment.
@@ -218,7 +218,7 @@ func (x *Environment) GetState() Environment_State {
 	return Environment_STATE_UNSPECIFIED
 }
 
-func (x *Environment) GetUpdateTime() *timestamp.Timestamp {
+func (x *Environment) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -590,7 +590,7 @@ type UpdateEnvironmentRequest struct {
 	// Required. The environment to update.
 	Environment *Environment `protobuf:"bytes,1,opt,name=environment,proto3" json:"environment,omitempty"`
 	// Required. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. This field is used to prevent accidental overwrite of the default
 	// environment, which is an operation that cannot be undone. To confirm that
 	// the caller desires this overwrite, this field must be explicitly set to
@@ -637,7 +637,7 @@ func (x *UpdateEnvironmentRequest) GetEnvironment() *Environment {
 	return nil
 }
 
-func (x *UpdateEnvironmentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEnvironmentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -869,7 +869,7 @@ type EnvironmentHistory_Entry struct {
 	// The developer-provided description for this environment history entry.
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// The creation time of this environment history entry.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *EnvironmentHistory_Entry) Reset() {
@@ -918,7 +918,7 @@ func (x *EnvironmentHistory_Entry) GetDescription() string {
 	return ""
 }
 
-func (x *EnvironmentHistory_Entry) GetCreateTime() *timestamp.Timestamp {
+func (x *EnvironmentHistory_Entry) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1264,12 +1264,12 @@ var file_google_cloud_dialogflow_v2_environment_proto_goTypes = []interface{}{
 	(*EnvironmentHistory)(nil),           // 10: google.cloud.dialogflow.v2.EnvironmentHistory
 	nil,                                  // 11: google.cloud.dialogflow.v2.TextToSpeechSettings.SynthesizeSpeechConfigsEntry
 	(*EnvironmentHistory_Entry)(nil),     // 12: google.cloud.dialogflow.v2.EnvironmentHistory.Entry
-	(*timestamp.Timestamp)(nil),          // 13: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),        // 13: google.protobuf.Timestamp
 	(*Fulfillment)(nil),                  // 14: google.cloud.dialogflow.v2.Fulfillment
 	(OutputAudioEncoding)(0),             // 15: google.cloud.dialogflow.v2.OutputAudioEncoding
-	(*field_mask.FieldMask)(nil),         // 16: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),        // 16: google.protobuf.FieldMask
 	(*SynthesizeSpeechConfig)(nil),       // 17: google.cloud.dialogflow.v2.SynthesizeSpeechConfig
-	(*empty.Empty)(nil),                  // 18: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                // 18: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_v2_environment_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.dialogflow.v2.Environment.state:type_name -> google.cloud.dialogflow.v2.Environment.State
@@ -1498,7 +1498,7 @@ type EnvironmentsClient interface {
 	// draft agent to a version before calling this method.
 	UpdateEnvironment(ctx context.Context, in *UpdateEnvironmentRequest, opts ...grpc.CallOption) (*Environment, error)
 	// Deletes the specified agent environment.
-	DeleteEnvironment(ctx context.Context, in *DeleteEnvironmentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEnvironment(ctx context.Context, in *DeleteEnvironmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets the history of the specified environment.
 	GetEnvironmentHistory(ctx context.Context, in *GetEnvironmentHistoryRequest, opts ...grpc.CallOption) (*EnvironmentHistory, error)
 }
@@ -1547,8 +1547,8 @@ func (c *environmentsClient) UpdateEnvironment(ctx context.Context, in *UpdateEn
 	return out, nil
 }
 
-func (c *environmentsClient) DeleteEnvironment(ctx context.Context, in *DeleteEnvironmentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *environmentsClient) DeleteEnvironment(ctx context.Context, in *DeleteEnvironmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Environments/DeleteEnvironment", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1587,7 +1587,7 @@ type EnvironmentsServer interface {
 	// draft agent to a version before calling this method.
 	UpdateEnvironment(context.Context, *UpdateEnvironmentRequest) (*Environment, error)
 	// Deletes the specified agent environment.
-	DeleteEnvironment(context.Context, *DeleteEnvironmentRequest) (*empty.Empty, error)
+	DeleteEnvironment(context.Context, *DeleteEnvironmentRequest) (*emptypb.Empty, error)
 	// Gets the history of the specified environment.
 	GetEnvironmentHistory(context.Context, *GetEnvironmentHistoryRequest) (*EnvironmentHistory, error)
 }
@@ -1608,7 +1608,7 @@ func (*UnimplementedEnvironmentsServer) CreateEnvironment(context.Context, *Crea
 func (*UnimplementedEnvironmentsServer) UpdateEnvironment(context.Context, *UpdateEnvironmentRequest) (*Environment, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEnvironment not implemented")
 }
-func (*UnimplementedEnvironmentsServer) DeleteEnvironment(context.Context, *DeleteEnvironmentRequest) (*empty.Empty, error) {
+func (*UnimplementedEnvironmentsServer) DeleteEnvironment(context.Context, *DeleteEnvironmentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEnvironment not implemented")
 }
 func (*UnimplementedEnvironmentsServer) GetEnvironmentHistory(context.Context, *GetEnvironmentHistoryRequest) (*EnvironmentHistory, error) {
diff --git a/dialogflow/apiv2/dialogflowpb/fulfillment.pb.go b/dialogflow/apiv2/dialogflowpb/fulfillment.pb.go
index e95a7e4e92a..3aa025f33e0 100644
--- a/dialogflow/apiv2/dialogflowpb/fulfillment.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/fulfillment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/fulfillment.proto
 
 package dialogflowpb
@@ -26,12 +26,12 @@ import (
 	sync "sync"
 
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -274,7 +274,7 @@ type UpdateFulfillmentRequest struct {
 	Fulfillment *Fulfillment `protobuf:"bytes,1,opt,name=fulfillment,proto3" json:"fulfillment,omitempty"`
 	// Required. The mask to control which fields get updated. If the mask is not
 	// present, all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateFulfillmentRequest) Reset() {
@@ -316,7 +316,7 @@ func (x *UpdateFulfillmentRequest) GetFulfillment() *Fulfillment {
 	return nil
 }
 
-func (x *UpdateFulfillmentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateFulfillmentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -641,7 +641,7 @@ var file_google_cloud_dialogflow_v2_fulfillment_proto_goTypes = []interface{}{
 	(*Fulfillment_GenericWebService)(nil), // 4: google.cloud.dialogflow.v2.Fulfillment.GenericWebService
 	(*Fulfillment_Feature)(nil),           // 5: google.cloud.dialogflow.v2.Fulfillment.Feature
 	nil,                                   // 6: google.cloud.dialogflow.v2.Fulfillment.GenericWebService.RequestHeadersEntry
-	(*field_mask.FieldMask)(nil),          // 7: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),         // 7: google.protobuf.FieldMask
 }
 var file_google_cloud_dialogflow_v2_fulfillment_proto_depIdxs = []int32{
 	4, // 0: google.cloud.dialogflow.v2.Fulfillment.generic_web_service:type_name -> google.cloud.dialogflow.v2.Fulfillment.GenericWebService
diff --git a/dialogflow/apiv2/dialogflowpb/gcs.pb.go b/dialogflow/apiv2/dialogflowpb/gcs.pb.go
index 5032278615e..3a828c505bc 100644
--- a/dialogflow/apiv2/dialogflowpb/gcs.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/gcs.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/gcs.proto
 
 package dialogflowpb
diff --git a/dialogflow/apiv2/dialogflowpb/human_agent_assistant_event.pb.go b/dialogflow/apiv2/dialogflowpb/human_agent_assistant_event.pb.go
index 477b70514c9..11850574594 100644
--- a/dialogflow/apiv2/dialogflowpb/human_agent_assistant_event.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/human_agent_assistant_event.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/human_agent_assistant_event.proto
 
 package dialogflowpb
diff --git a/dialogflow/apiv2/dialogflowpb/intent.pb.go b/dialogflow/apiv2/dialogflowpb/intent.pb.go
index 63e2d63a131..e1d6e45d217 100644
--- a/dialogflow/apiv2/dialogflowpb/intent.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/intent.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/intent.proto
 
 package dialogflowpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -1126,7 +1126,7 @@ type UpdateIntentRequest struct {
 	// data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
 	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. The resource view to apply to the returned intent.
 	IntentView IntentView `protobuf:"varint,4,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2.IntentView" json:"intent_view,omitempty"`
 }
@@ -1177,7 +1177,7 @@ func (x *UpdateIntentRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (x *UpdateIntentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateIntentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1264,7 +1264,7 @@ type BatchUpdateIntentsRequest struct {
 	// data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
 	LanguageCode string `protobuf:"bytes,4,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,5,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. The resource view to apply to the returned intent.
 	IntentView IntentView `protobuf:"varint,6,opt,name=intent_view,json=intentView,proto3,enum=google.cloud.dialogflow.v2.IntentView" json:"intent_view,omitempty"`
 }
@@ -1336,7 +1336,7 @@ func (x *BatchUpdateIntentsRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (x *BatchUpdateIntentsRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *BatchUpdateIntentsRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1850,7 +1850,7 @@ func (x *Intent_Message) GetCard() *Intent_Message_Card {
 	return nil
 }
 
-func (x *Intent_Message) GetPayload() *_struct.Struct {
+func (x *Intent_Message) GetPayload() *structpb.Struct {
 	if x, ok := x.GetMessage().(*Intent_Message_Payload); ok {
 		return x.Payload
 	}
@@ -1953,7 +1953,7 @@ type Intent_Message_Card_ struct {
 
 type Intent_Message_Payload struct {
 	// A custom platform-specific response.
-	Payload *_struct.Struct `protobuf:"bytes,5,opt,name=payload,proto3,oneof"`
+	Payload *structpb.Struct `protobuf:"bytes,5,opt,name=payload,proto3,oneof"`
 }
 
 type Intent_Message_SimpleResponses_ struct {
@@ -4822,9 +4822,9 @@ var file_google_cloud_dialogflow_v2_intent_proto_goTypes = []interface{}{
 	(*Intent_Message_BrowseCarouselCard_BrowseCarouselCardItem)(nil),               // 49: google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.BrowseCarouselCardItem
 	(*Intent_Message_BrowseCarouselCard_BrowseCarouselCardItem_OpenUrlAction)(nil), // 50: google.cloud.dialogflow.v2.Intent.Message.BrowseCarouselCard.BrowseCarouselCardItem.OpenUrlAction
 	(*Context)(nil),                                                                // 51: google.cloud.dialogflow.v2.Context
-	(*field_mask.FieldMask)(nil),                                                   // 52: google.protobuf.FieldMask
-	(*_struct.Struct)(nil),                                                         // 53: google.protobuf.Struct
-	(*empty.Empty)(nil),                                                            // 54: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),                                                  // 52: google.protobuf.FieldMask
+	(*structpb.Struct)(nil),                                                        // 53: google.protobuf.Struct
+	(*emptypb.Empty)(nil),                                                          // 54: google.protobuf.Empty
 	(*longrunning.Operation)(nil),                                                  // 55: google.longrunning.Operation
 }
 var file_google_cloud_dialogflow_v2_intent_proto_depIdxs = []int32{
@@ -5516,7 +5516,7 @@ type IntentsClient interface {
 	// Note: You should always train an agent prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/es/docs/training).
-	DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates/Creates multiple intents in the specified agent.
 	//
 	// This method is a [long-running
@@ -5592,8 +5592,8 @@ func (c *intentsClient) UpdateIntent(ctx context.Context, in *UpdateIntentReques
 	return out, nil
 }
 
-func (c *intentsClient) DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *intentsClient) DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Intents/DeleteIntent", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -5642,7 +5642,7 @@ type IntentsServer interface {
 	// Note: You should always train an agent prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/es/docs/training).
-	DeleteIntent(context.Context, *DeleteIntentRequest) (*empty.Empty, error)
+	DeleteIntent(context.Context, *DeleteIntentRequest) (*emptypb.Empty, error)
 	// Updates/Creates multiple intents in the specified agent.
 	//
 	// This method is a [long-running
@@ -5690,7 +5690,7 @@ func (*UnimplementedIntentsServer) CreateIntent(context.Context, *CreateIntentRe
 func (*UnimplementedIntentsServer) UpdateIntent(context.Context, *UpdateIntentRequest) (*Intent, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateIntent not implemented")
 }
-func (*UnimplementedIntentsServer) DeleteIntent(context.Context, *DeleteIntentRequest) (*empty.Empty, error) {
+func (*UnimplementedIntentsServer) DeleteIntent(context.Context, *DeleteIntentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteIntent not implemented")
 }
 func (*UnimplementedIntentsServer) BatchUpdateIntents(context.Context, *BatchUpdateIntentsRequest) (*longrunning.Operation, error) {
diff --git a/dialogflow/apiv2/dialogflowpb/knowledge_base.pb.go b/dialogflow/apiv2/dialogflowpb/knowledge_base.pb.go
index eae509fd9ce..38a1484086f 100644
--- a/dialogflow/apiv2/dialogflowpb/knowledge_base.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/knowledge_base.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/knowledge_base.proto
 
 package dialogflowpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -468,7 +468,7 @@ type UpdateKnowledgeBaseRequest struct {
 	// Optional. Not specified means `update all`.
 	// Currently, only `display_name` can be updated, an InvalidArgument will be
 	// returned for attempting to update other fields.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateKnowledgeBaseRequest) Reset() {
@@ -510,7 +510,7 @@ func (x *UpdateKnowledgeBaseRequest) GetKnowledgeBase() *KnowledgeBase {
 	return nil
 }
 
-func (x *UpdateKnowledgeBaseRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateKnowledgeBaseRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -754,8 +754,8 @@ var file_google_cloud_dialogflow_v2_knowledge_base_proto_goTypes = []interface{}
 	(*CreateKnowledgeBaseRequest)(nil), // 4: google.cloud.dialogflow.v2.CreateKnowledgeBaseRequest
 	(*DeleteKnowledgeBaseRequest)(nil), // 5: google.cloud.dialogflow.v2.DeleteKnowledgeBaseRequest
 	(*UpdateKnowledgeBaseRequest)(nil), // 6: google.cloud.dialogflow.v2.UpdateKnowledgeBaseRequest
-	(*field_mask.FieldMask)(nil),       // 7: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                // 8: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),      // 7: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),              // 8: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_v2_knowledge_base_proto_depIdxs = []int32{
 	0, // 0: google.cloud.dialogflow.v2.ListKnowledgeBasesResponse.knowledge_bases:type_name -> google.cloud.dialogflow.v2.KnowledgeBase
@@ -909,7 +909,7 @@ type KnowledgeBasesClient interface {
 	// Creates a knowledge base.
 	CreateKnowledgeBase(ctx context.Context, in *CreateKnowledgeBaseRequest, opts ...grpc.CallOption) (*KnowledgeBase, error)
 	// Deletes the specified knowledge base.
-	DeleteKnowledgeBase(ctx context.Context, in *DeleteKnowledgeBaseRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteKnowledgeBase(ctx context.Context, in *DeleteKnowledgeBaseRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates the specified knowledge base.
 	UpdateKnowledgeBase(ctx context.Context, in *UpdateKnowledgeBaseRequest, opts ...grpc.CallOption) (*KnowledgeBase, error)
 }
@@ -949,8 +949,8 @@ func (c *knowledgeBasesClient) CreateKnowledgeBase(ctx context.Context, in *Crea
 	return out, nil
 }
 
-func (c *knowledgeBasesClient) DeleteKnowledgeBase(ctx context.Context, in *DeleteKnowledgeBaseRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *knowledgeBasesClient) DeleteKnowledgeBase(ctx context.Context, in *DeleteKnowledgeBaseRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.KnowledgeBases/DeleteKnowledgeBase", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -976,7 +976,7 @@ type KnowledgeBasesServer interface {
 	// Creates a knowledge base.
 	CreateKnowledgeBase(context.Context, *CreateKnowledgeBaseRequest) (*KnowledgeBase, error)
 	// Deletes the specified knowledge base.
-	DeleteKnowledgeBase(context.Context, *DeleteKnowledgeBaseRequest) (*empty.Empty, error)
+	DeleteKnowledgeBase(context.Context, *DeleteKnowledgeBaseRequest) (*emptypb.Empty, error)
 	// Updates the specified knowledge base.
 	UpdateKnowledgeBase(context.Context, *UpdateKnowledgeBaseRequest) (*KnowledgeBase, error)
 }
@@ -994,7 +994,7 @@ func (*UnimplementedKnowledgeBasesServer) GetKnowledgeBase(context.Context, *Get
 func (*UnimplementedKnowledgeBasesServer) CreateKnowledgeBase(context.Context, *CreateKnowledgeBaseRequest) (*KnowledgeBase, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateKnowledgeBase not implemented")
 }
-func (*UnimplementedKnowledgeBasesServer) DeleteKnowledgeBase(context.Context, *DeleteKnowledgeBaseRequest) (*empty.Empty, error) {
+func (*UnimplementedKnowledgeBasesServer) DeleteKnowledgeBase(context.Context, *DeleteKnowledgeBaseRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteKnowledgeBase not implemented")
 }
 func (*UnimplementedKnowledgeBasesServer) UpdateKnowledgeBase(context.Context, *UpdateKnowledgeBaseRequest) (*KnowledgeBase, error) {
diff --git a/dialogflow/apiv2/dialogflowpb/participant.pb.go b/dialogflow/apiv2/dialogflowpb/participant.pb.go
index 9737eb91d43..672aac2edc7 100644
--- a/dialogflow/apiv2/dialogflowpb/participant.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/participant.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/participant.proto
 
 package dialogflowpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -277,9 +277,9 @@ type Message struct {
 	// Output only. The role of the participant.
 	ParticipantRole Participant_Role `protobuf:"varint,5,opt,name=participant_role,json=participantRole,proto3,enum=google.cloud.dialogflow.v2.Participant_Role" json:"participant_role,omitempty"`
 	// Output only. The time when the message was created in Contact Center AI.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Optional. The time when the message was sent.
-	SendTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=send_time,json=sendTime,proto3" json:"send_time,omitempty"`
+	SendTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=send_time,json=sendTime,proto3" json:"send_time,omitempty"`
 	// Output only. The annotation for the message.
 	MessageAnnotation *MessageAnnotation `protobuf:"bytes,7,opt,name=message_annotation,json=messageAnnotation,proto3" json:"message_annotation,omitempty"`
 	// Output only. The sentiment analysis result for the message.
@@ -353,14 +353,14 @@ func (x *Message) GetParticipantRole() Participant_Role {
 	return Participant_ROLE_UNSPECIFIED
 }
 
-func (x *Message) GetCreateTime() *timestamp.Timestamp {
+func (x *Message) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Message) GetSendTime() *timestamp.Timestamp {
+func (x *Message) GetSendTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SendTime
 	}
@@ -631,7 +631,7 @@ type UpdateParticipantRequest struct {
 	// Required. The participant to update.
 	Participant *Participant `protobuf:"bytes,1,opt,name=participant,proto3" json:"participant,omitempty"`
 	// Required. The mask to specify which fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateParticipantRequest) Reset() {
@@ -673,7 +673,7 @@ func (x *UpdateParticipantRequest) GetParticipant() *Participant {
 	return nil
 }
 
-func (x *UpdateParticipantRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateParticipantRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -713,7 +713,7 @@ type AnalyzeContentRequest struct {
 	//
 	// Note: this field should only be used if you are connecting to a Dialogflow
 	// CX agent.
-	CxParameters *_struct.Struct `protobuf:"bytes,18,opt,name=cx_parameters,json=cxParameters,proto3" json:"cx_parameters,omitempty"`
+	CxParameters *structpb.Struct `protobuf:"bytes,18,opt,name=cx_parameters,json=cxParameters,proto3" json:"cx_parameters,omitempty"`
 	// A unique identifier for this request. Restricted to 36 ASCII characters.
 	// A random UUID is recommended.
 	// This request is only idempotent if a `request_id` is provided.
@@ -801,7 +801,7 @@ func (x *AnalyzeContentRequest) GetAssistQueryParams() *AssistQueryParameters {
 	return nil
 }
 
-func (x *AnalyzeContentRequest) GetCxParameters() *_struct.Struct {
+func (x *AnalyzeContentRequest) GetCxParameters() *structpb.Struct {
 	if x != nil {
 		return x.CxParameters
 	}
@@ -2042,7 +2042,7 @@ type AnnotatedMessagePart struct {
 	//	}
 	//
 	// </pre>
-	FormattedValue *_struct.Value `protobuf:"bytes,3,opt,name=formatted_value,json=formattedValue,proto3" json:"formatted_value,omitempty"`
+	FormattedValue *structpb.Value `protobuf:"bytes,3,opt,name=formatted_value,json=formattedValue,proto3" json:"formatted_value,omitempty"`
 }
 
 func (x *AnnotatedMessagePart) Reset() {
@@ -2091,7 +2091,7 @@ func (x *AnnotatedMessagePart) GetEntityType() string {
 	return ""
 }
 
-func (x *AnnotatedMessagePart) GetFormattedValue() *_struct.Value {
+func (x *AnnotatedMessagePart) GetFormattedValue() *structpb.Value {
 	if x != nil {
 		return x.FormattedValue
 	}
@@ -2936,17 +2936,17 @@ var file_google_cloud_dialogflow_v2_participant_proto_goTypes = []interface{}{
 	nil,                                              // 28: google.cloud.dialogflow.v2.ArticleAnswer.MetadataEntry
 	nil,                                              // 29: google.cloud.dialogflow.v2.FaqAnswer.MetadataEntry
 	nil,                                              // 30: google.cloud.dialogflow.v2.AssistQueryParameters.DocumentsMetadataFiltersEntry
-	(*timestamp.Timestamp)(nil),                      // 31: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                    // 31: google.protobuf.Timestamp
 	(*SentimentAnalysisResult)(nil),                  // 32: google.cloud.dialogflow.v2.SentimentAnalysisResult
-	(*field_mask.FieldMask)(nil),                     // 33: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                    // 33: google.protobuf.FieldMask
 	(*TextInput)(nil),                                // 34: google.cloud.dialogflow.v2.TextInput
 	(*EventInput)(nil),                               // 35: google.cloud.dialogflow.v2.EventInput
 	(*OutputAudioConfig)(nil),                        // 36: google.cloud.dialogflow.v2.OutputAudioConfig
 	(*QueryParameters)(nil),                          // 37: google.cloud.dialogflow.v2.QueryParameters
-	(*_struct.Struct)(nil),                           // 38: google.protobuf.Struct
+	(*structpb.Struct)(nil),                          // 38: google.protobuf.Struct
 	(*DetectIntentResponse)(nil),                     // 39: google.cloud.dialogflow.v2.DetectIntentResponse
 	(*status.Status)(nil),                            // 40: google.rpc.Status
-	(*_struct.Value)(nil),                            // 41: google.protobuf.Value
+	(*structpb.Value)(nil),                           // 41: google.protobuf.Value
 }
 var file_google_cloud_dialogflow_v2_participant_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.dialogflow.v2.Participant.role:type_name -> google.cloud.dialogflow.v2.Participant.Role
diff --git a/dialogflow/apiv2/dialogflowpb/session.pb.go b/dialogflow/apiv2/dialogflowpb/session.pb.go
index eb2929b2fcc..b0f758136ff 100644
--- a/dialogflow/apiv2/dialogflowpb/session.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/session.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/session.proto
 
 package dialogflowpb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	_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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -149,7 +149,7 @@ type DetectIntentRequest struct {
 	//
 	// If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.DetectIntentRequest.output_audio_config] replaces the agent-level
 	// config in its entirety.
-	OutputAudioConfigMask *field_mask.FieldMask `protobuf:"bytes,7,opt,name=output_audio_config_mask,json=outputAudioConfigMask,proto3" json:"output_audio_config_mask,omitempty"`
+	OutputAudioConfigMask *fieldmaskpb.FieldMask `protobuf:"bytes,7,opt,name=output_audio_config_mask,json=outputAudioConfigMask,proto3" json:"output_audio_config_mask,omitempty"`
 	// The natural language speech audio to be processed. This field
 	// should be populated iff `query_input` is set to an input audio config.
 	// A single request can contain up to 1 minute of speech audio data.
@@ -216,7 +216,7 @@ func (x *DetectIntentRequest) GetOutputAudioConfig() *OutputAudioConfig {
 	return nil
 }
 
-func (x *DetectIntentRequest) GetOutputAudioConfigMask() *field_mask.FieldMask {
+func (x *DetectIntentRequest) GetOutputAudioConfigMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.OutputAudioConfigMask
 	}
@@ -354,7 +354,7 @@ type QueryParameters struct {
 	// If supplied, the value is used to populate the
 	// `WebhookRequest.original_detect_intent_request.payload`
 	// field sent to your webhook.
-	Payload *_struct.Struct `protobuf:"bytes,6,opt,name=payload,proto3" json:"payload,omitempty"`
+	Payload *structpb.Struct `protobuf:"bytes,6,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Configures the type of sentiment analysis to perform. If not
 	// provided, sentiment analysis is not performed.
 	SentimentAnalysisRequestConfig *SentimentAnalysisRequestConfig `protobuf:"bytes,10,opt,name=sentiment_analysis_request_config,json=sentimentAnalysisRequestConfig,proto3" json:"sentiment_analysis_request_config,omitempty"`
@@ -437,7 +437,7 @@ func (x *QueryParameters) GetSessionEntityTypes() []*SessionEntityType {
 	return nil
 }
 
-func (x *QueryParameters) GetPayload() *_struct.Struct {
+func (x *QueryParameters) GetPayload() *structpb.Struct {
 	if x != nil {
 		return x.Payload
 	}
@@ -617,7 +617,7 @@ type QueryResult struct {
 	//   - If parameter's entity type is a composite entity:
 	//     map from composite entity property names to property values
 	//   - Else: parameter value
-	Parameters *_struct.Struct `protobuf:"bytes,4,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	Parameters *structpb.Struct `protobuf:"bytes,4,opt,name=parameters,proto3" json:"parameters,omitempty"`
 	// This field is set to:
 	//
 	//   - `false` if the matched intent has required parameters and not all of
@@ -639,7 +639,7 @@ type QueryResult struct {
 	WebhookSource string `protobuf:"bytes,8,opt,name=webhook_source,json=webhookSource,proto3" json:"webhook_source,omitempty"`
 	// If the query was fulfilled by a webhook call, this field is set to the
 	// value of the `payload` field returned in the webhook response.
-	WebhookPayload *_struct.Struct `protobuf:"bytes,9,opt,name=webhook_payload,json=webhookPayload,proto3" json:"webhook_payload,omitempty"`
+	WebhookPayload *structpb.Struct `protobuf:"bytes,9,opt,name=webhook_payload,json=webhookPayload,proto3" json:"webhook_payload,omitempty"`
 	// The collection of output contexts. If applicable,
 	// `output_contexts.parameters` contains entries with name
 	// `<parameter name>.original` containing the original parameter values
@@ -665,7 +665,7 @@ type QueryResult struct {
 	//
 	// - webhook call latency
 	// - webhook errors
-	DiagnosticInfo *_struct.Struct `protobuf:"bytes,14,opt,name=diagnostic_info,json=diagnosticInfo,proto3" json:"diagnostic_info,omitempty"`
+	DiagnosticInfo *structpb.Struct `protobuf:"bytes,14,opt,name=diagnostic_info,json=diagnosticInfo,proto3" json:"diagnostic_info,omitempty"`
 	// The sentiment analysis result, which depends on the
 	// `sentiment_analysis_request_config` specified in the request.
 	SentimentAnalysisResult *SentimentAnalysisResult `protobuf:"bytes,17,opt,name=sentiment_analysis_result,json=sentimentAnalysisResult,proto3" json:"sentiment_analysis_result,omitempty"`
@@ -731,7 +731,7 @@ func (x *QueryResult) GetAction() string {
 	return ""
 }
 
-func (x *QueryResult) GetParameters() *_struct.Struct {
+func (x *QueryResult) GetParameters() *structpb.Struct {
 	if x != nil {
 		return x.Parameters
 	}
@@ -773,7 +773,7 @@ func (x *QueryResult) GetWebhookSource() string {
 	return ""
 }
 
-func (x *QueryResult) GetWebhookPayload() *_struct.Struct {
+func (x *QueryResult) GetWebhookPayload() *structpb.Struct {
 	if x != nil {
 		return x.WebhookPayload
 	}
@@ -801,7 +801,7 @@ func (x *QueryResult) GetIntentDetectionConfidence() float32 {
 	return 0
 }
 
-func (x *QueryResult) GetDiagnosticInfo() *_struct.Struct {
+func (x *QueryResult) GetDiagnosticInfo() *structpb.Struct {
 	if x != nil {
 		return x.DiagnosticInfo
 	}
@@ -902,7 +902,7 @@ type StreamingDetectIntentRequest struct {
 	//
 	// If unspecified or empty, [output_audio_config][google.cloud.dialogflow.v2.StreamingDetectIntentRequest.output_audio_config] replaces the agent-level
 	// config in its entirety.
-	OutputAudioConfigMask *field_mask.FieldMask `protobuf:"bytes,7,opt,name=output_audio_config_mask,json=outputAudioConfigMask,proto3" json:"output_audio_config_mask,omitempty"`
+	OutputAudioConfigMask *fieldmaskpb.FieldMask `protobuf:"bytes,7,opt,name=output_audio_config_mask,json=outputAudioConfigMask,proto3" json:"output_audio_config_mask,omitempty"`
 	// The input audio content to be recognized. Must be sent if
 	// `query_input` was set to a streaming input audio config. The complete audio
 	// over all streaming messages must not exceed 1 minute.
@@ -977,7 +977,7 @@ func (x *StreamingDetectIntentRequest) GetOutputAudioConfig() *OutputAudioConfig
 	return nil
 }
 
-func (x *StreamingDetectIntentRequest) GetOutputAudioConfigMask() *field_mask.FieldMask {
+func (x *StreamingDetectIntentRequest) GetOutputAudioConfigMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.OutputAudioConfigMask
 	}
@@ -1173,7 +1173,7 @@ type StreamingRecognitionResult struct {
 	SpeechWordInfo []*SpeechWordInfo `protobuf:"bytes,7,rep,name=speech_word_info,json=speechWordInfo,proto3" json:"speech_word_info,omitempty"`
 	// Time offset of the end of this Speech recognition result relative to the
 	// beginning of the audio. Only populated for `message_type` = `TRANSCRIPT`.
-	SpeechEndOffset *duration.Duration `protobuf:"bytes,8,opt,name=speech_end_offset,json=speechEndOffset,proto3" json:"speech_end_offset,omitempty"`
+	SpeechEndOffset *durationpb.Duration `protobuf:"bytes,8,opt,name=speech_end_offset,json=speechEndOffset,proto3" json:"speech_end_offset,omitempty"`
 	// Detected language code for the transcript.
 	LanguageCode string `protobuf:"bytes,10,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 }
@@ -1245,7 +1245,7 @@ func (x *StreamingRecognitionResult) GetSpeechWordInfo() []*SpeechWordInfo {
 	return nil
 }
 
-func (x *StreamingRecognitionResult) GetSpeechEndOffset() *duration.Duration {
+func (x *StreamingRecognitionResult) GetSpeechEndOffset() *durationpb.Duration {
 	if x != nil {
 		return x.SpeechEndOffset
 	}
@@ -1353,7 +1353,7 @@ type EventInput struct {
 	//   - If parameter's entity type is a composite entity:
 	//     map from composite entity property names to property values
 	//   - Else: parameter value
-	Parameters *_struct.Struct `protobuf:"bytes,2,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	Parameters *structpb.Struct `protobuf:"bytes,2,opt,name=parameters,proto3" json:"parameters,omitempty"`
 	// Required. The language of this query. See [Language
 	// Support](https://cloud.google.com/dialogflow/docs/reference/language)
 	// for a list of the currently supported language codes. Note that queries in
@@ -1405,7 +1405,7 @@ func (x *EventInput) GetName() string {
 	return ""
 }
 
-func (x *EventInput) GetParameters() *_struct.Struct {
+func (x *EventInput) GetParameters() *structpb.Struct {
 	if x != nil {
 		return x.Parameters
 	}
@@ -2025,17 +2025,17 @@ var file_google_cloud_dialogflow_v2_session_proto_goTypes = []interface{}{
 	(*Sentiment)(nil),                           // 13: google.cloud.dialogflow.v2.Sentiment
 	nil,                                         // 14: google.cloud.dialogflow.v2.QueryParameters.WebhookHeadersEntry
 	(*OutputAudioConfig)(nil),                   // 15: google.cloud.dialogflow.v2.OutputAudioConfig
-	(*field_mask.FieldMask)(nil),                // 16: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),               // 16: google.protobuf.FieldMask
 	(*status.Status)(nil),                       // 17: google.rpc.Status
 	(*latlng.LatLng)(nil),                       // 18: google.type.LatLng
 	(*Context)(nil),                             // 19: google.cloud.dialogflow.v2.Context
 	(*SessionEntityType)(nil),                   // 20: google.cloud.dialogflow.v2.SessionEntityType
-	(*_struct.Struct)(nil),                      // 21: google.protobuf.Struct
+	(*structpb.Struct)(nil),                     // 21: google.protobuf.Struct
 	(*InputAudioConfig)(nil),                    // 22: google.cloud.dialogflow.v2.InputAudioConfig
 	(*Intent_Message)(nil),                      // 23: google.cloud.dialogflow.v2.Intent.Message
 	(*Intent)(nil),                              // 24: google.cloud.dialogflow.v2.Intent
 	(*SpeechWordInfo)(nil),                      // 25: google.cloud.dialogflow.v2.SpeechWordInfo
-	(*duration.Duration)(nil),                   // 26: google.protobuf.Duration
+	(*durationpb.Duration)(nil),                 // 26: google.protobuf.Duration
 }
 var file_google_cloud_dialogflow_v2_session_proto_depIdxs = []int32{
 	3,  // 0: google.cloud.dialogflow.v2.DetectIntentRequest.query_params:type_name -> google.cloud.dialogflow.v2.QueryParameters
diff --git a/dialogflow/apiv2/dialogflowpb/session_entity_type.pb.go b/dialogflow/apiv2/dialogflowpb/session_entity_type.pb.go
index 244ccb43b5e..f8e9f67df3c 100644
--- a/dialogflow/apiv2/dialogflowpb/session_entity_type.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/session_entity_type.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/session_entity_type.proto
 
 package dialogflowpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -449,7 +449,7 @@ type UpdateSessionEntityTypeRequest struct {
 	// Required. The session entity type to update.
 	SessionEntityType *SessionEntityType `protobuf:"bytes,1,opt,name=session_entity_type,json=sessionEntityType,proto3" json:"session_entity_type,omitempty"`
 	// Optional. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSessionEntityTypeRequest) Reset() {
@@ -491,7 +491,7 @@ func (x *UpdateSessionEntityTypeRequest) GetSessionEntityType() *SessionEntityTy
 	return nil
 }
 
-func (x *UpdateSessionEntityTypeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSessionEntityTypeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -893,8 +893,8 @@ var file_google_cloud_dialogflow_v2_session_entity_type_proto_goTypes = []interf
 	(*UpdateSessionEntityTypeRequest)(nil),    // 6: google.cloud.dialogflow.v2.UpdateSessionEntityTypeRequest
 	(*DeleteSessionEntityTypeRequest)(nil),    // 7: google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest
 	(*EntityType_Entity)(nil),                 // 8: google.cloud.dialogflow.v2.EntityType.Entity
-	(*field_mask.FieldMask)(nil),              // 9: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                       // 10: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),             // 9: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                     // 10: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_v2_session_entity_type_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.dialogflow.v2.SessionEntityType.entity_override_mode:type_name -> google.cloud.dialogflow.v2.SessionEntityType.EntityOverrideMode
@@ -1077,7 +1077,7 @@ type SessionEntityTypesClient interface {
 	// This method doesn't work with Google Assistant integration.
 	// Contact Dialogflow support if you need to use session entities
 	// with Google Assistant integration.
-	DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type sessionEntityTypesClient struct {
@@ -1124,8 +1124,8 @@ func (c *sessionEntityTypesClient) UpdateSessionEntityType(ctx context.Context,
 	return out, nil
 }
 
-func (c *sessionEntityTypesClient) DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *sessionEntityTypesClient) DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.SessionEntityTypes/DeleteSessionEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1167,7 +1167,7 @@ type SessionEntityTypesServer interface {
 	// This method doesn't work with Google Assistant integration.
 	// Contact Dialogflow support if you need to use session entities
 	// with Google Assistant integration.
-	DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*empty.Empty, error)
+	DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedSessionEntityTypesServer can be embedded to have forward compatible implementations.
@@ -1186,7 +1186,7 @@ func (*UnimplementedSessionEntityTypesServer) CreateSessionEntityType(context.Co
 func (*UnimplementedSessionEntityTypesServer) UpdateSessionEntityType(context.Context, *UpdateSessionEntityTypeRequest) (*SessionEntityType, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateSessionEntityType not implemented")
 }
-func (*UnimplementedSessionEntityTypesServer) DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*empty.Empty, error) {
+func (*UnimplementedSessionEntityTypesServer) DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteSessionEntityType not implemented")
 }
 
diff --git a/dialogflow/apiv2/dialogflowpb/validation_result.pb.go b/dialogflow/apiv2/dialogflowpb/validation_result.pb.go
index 097ec48fdec..cc378d70a84 100644
--- a/dialogflow/apiv2/dialogflowpb/validation_result.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/validation_result.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/validation_result.proto
 
 package dialogflowpb
diff --git a/dialogflow/apiv2/dialogflowpb/version.pb.go b/dialogflow/apiv2/dialogflowpb/version.pb.go
index 89b0de80ab0..36f51397afc 100644
--- a/dialogflow/apiv2/dialogflowpb/version.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/version.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/version.proto
 
 package dialogflowpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -137,7 +137,7 @@ type Version struct {
 	VersionNumber int32 `protobuf:"varint,3,opt,name=version_number,json=versionNumber,proto3" json:"version_number,omitempty"`
 	// Output only. The creation time of this version. This field is read-only, i.e., it cannot
 	// be set by create and update methods.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The status of this version. This field is read-only and cannot be set by
 	// create and update methods.
 	Status Version_VersionStatus `protobuf:"varint,6,opt,name=status,proto3,enum=google.cloud.dialogflow.v2.Version_VersionStatus" json:"status,omitempty"`
@@ -196,7 +196,7 @@ func (x *Version) GetVersionNumber() int32 {
 	return 0
 }
 
-func (x *Version) GetCreateTime() *timestamp.Timestamp {
+func (x *Version) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -472,7 +472,7 @@ type UpdateVersionRequest struct {
 	//     ID>`
 	Version *Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
 	// Required. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateVersionRequest) Reset() {
@@ -514,7 +514,7 @@ func (x *UpdateVersionRequest) GetVersion() *Version {
 	return nil
 }
 
-func (x *UpdateVersionRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateVersionRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -784,17 +784,17 @@ func file_google_cloud_dialogflow_v2_version_proto_rawDescGZIP() []byte {
 var file_google_cloud_dialogflow_v2_version_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_dialogflow_v2_version_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_google_cloud_dialogflow_v2_version_proto_goTypes = []interface{}{
-	(Version_VersionStatus)(0),   // 0: google.cloud.dialogflow.v2.Version.VersionStatus
-	(*Version)(nil),              // 1: google.cloud.dialogflow.v2.Version
-	(*ListVersionsRequest)(nil),  // 2: google.cloud.dialogflow.v2.ListVersionsRequest
-	(*ListVersionsResponse)(nil), // 3: google.cloud.dialogflow.v2.ListVersionsResponse
-	(*GetVersionRequest)(nil),    // 4: google.cloud.dialogflow.v2.GetVersionRequest
-	(*CreateVersionRequest)(nil), // 5: google.cloud.dialogflow.v2.CreateVersionRequest
-	(*UpdateVersionRequest)(nil), // 6: google.cloud.dialogflow.v2.UpdateVersionRequest
-	(*DeleteVersionRequest)(nil), // 7: google.cloud.dialogflow.v2.DeleteVersionRequest
-	(*timestamp.Timestamp)(nil),  // 8: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil), // 9: google.protobuf.FieldMask
-	(*empty.Empty)(nil),          // 10: google.protobuf.Empty
+	(Version_VersionStatus)(0),    // 0: google.cloud.dialogflow.v2.Version.VersionStatus
+	(*Version)(nil),               // 1: google.cloud.dialogflow.v2.Version
+	(*ListVersionsRequest)(nil),   // 2: google.cloud.dialogflow.v2.ListVersionsRequest
+	(*ListVersionsResponse)(nil),  // 3: google.cloud.dialogflow.v2.ListVersionsResponse
+	(*GetVersionRequest)(nil),     // 4: google.cloud.dialogflow.v2.GetVersionRequest
+	(*CreateVersionRequest)(nil),  // 5: google.cloud.dialogflow.v2.CreateVersionRequest
+	(*UpdateVersionRequest)(nil),  // 6: google.cloud.dialogflow.v2.UpdateVersionRequest
+	(*DeleteVersionRequest)(nil),  // 7: google.cloud.dialogflow.v2.DeleteVersionRequest
+	(*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil), // 9: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),         // 10: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_v2_version_proto_depIdxs = []int32{
 	8,  // 0: google.cloud.dialogflow.v2.Version.create_time:type_name -> google.protobuf.Timestamp
@@ -959,7 +959,7 @@ type VersionsClient interface {
 	// properties of the version resource.
 	UpdateVersion(ctx context.Context, in *UpdateVersionRequest, opts ...grpc.CallOption) (*Version, error)
 	// Delete the specified agent version.
-	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type versionsClient struct {
@@ -1006,8 +1006,8 @@ func (c *versionsClient) UpdateVersion(ctx context.Context, in *UpdateVersionReq
 	return out, nil
 }
 
-func (c *versionsClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *versionsClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.v2.Versions/DeleteVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1032,7 +1032,7 @@ type VersionsServer interface {
 	// properties of the version resource.
 	UpdateVersion(context.Context, *UpdateVersionRequest) (*Version, error)
 	// Delete the specified agent version.
-	DeleteVersion(context.Context, *DeleteVersionRequest) (*empty.Empty, error)
+	DeleteVersion(context.Context, *DeleteVersionRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedVersionsServer can be embedded to have forward compatible implementations.
@@ -1051,7 +1051,7 @@ func (*UnimplementedVersionsServer) CreateVersion(context.Context, *CreateVersio
 func (*UnimplementedVersionsServer) UpdateVersion(context.Context, *UpdateVersionRequest) (*Version, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateVersion not implemented")
 }
-func (*UnimplementedVersionsServer) DeleteVersion(context.Context, *DeleteVersionRequest) (*empty.Empty, error) {
+func (*UnimplementedVersionsServer) DeleteVersion(context.Context, *DeleteVersionRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteVersion not implemented")
 }
 
diff --git a/dialogflow/apiv2/dialogflowpb/webhook.pb.go b/dialogflow/apiv2/dialogflowpb/webhook.pb.go
index ba1e6c46ea6..0691cc845de 100644
--- a/dialogflow/apiv2/dialogflowpb/webhook.pb.go
+++ b/dialogflow/apiv2/dialogflowpb/webhook.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/v2/webhook.proto
 
 package dialogflowpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -162,7 +162,7 @@ type WebhookResponse struct {
 	// for rich response messages.
 	// See the format definition at [Google Assistant Dialogflow webhook
 	// format](https://developers.google.com/assistant/actions/build/json/dialogflow-webhook-json)
-	Payload *_struct.Struct `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
+	Payload *structpb.Struct `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Optional. The collection of output contexts that will overwrite currently
 	// active contexts for the session and reset their lifespans.
 	// When provided, Dialogflow uses this field to populate
@@ -233,7 +233,7 @@ func (x *WebhookResponse) GetSource() string {
 	return ""
 }
 
-func (x *WebhookResponse) GetPayload() *_struct.Struct {
+func (x *WebhookResponse) GetPayload() *structpb.Struct {
 	if x != nil {
 		return x.Payload
 	}
@@ -290,7 +290,7 @@ type OriginalDetectIntentRequest struct {
 	// Note: The caller ID field (`caller_id`) will be redacted for Trial
 	// Edition agents and populated with the caller ID in [E.164
 	// format](https://en.wikipedia.org/wiki/E.164) for Essentials Edition agents.
-	Payload *_struct.Struct `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
+	Payload *structpb.Struct `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"`
 }
 
 func (x *OriginalDetectIntentRequest) Reset() {
@@ -339,7 +339,7 @@ func (x *OriginalDetectIntentRequest) GetVersion() string {
 	return ""
 }
 
-func (x *OriginalDetectIntentRequest) GetPayload() *_struct.Struct {
+func (x *OriginalDetectIntentRequest) GetPayload() *structpb.Struct {
 	if x != nil {
 		return x.Payload
 	}
@@ -455,7 +455,7 @@ var file_google_cloud_dialogflow_v2_webhook_proto_goTypes = []interface{}{
 	(*OriginalDetectIntentRequest)(nil), // 2: google.cloud.dialogflow.v2.OriginalDetectIntentRequest
 	(*QueryResult)(nil),                 // 3: google.cloud.dialogflow.v2.QueryResult
 	(*Intent_Message)(nil),              // 4: google.cloud.dialogflow.v2.Intent.Message
-	(*_struct.Struct)(nil),              // 5: google.protobuf.Struct
+	(*structpb.Struct)(nil),             // 5: google.protobuf.Struct
 	(*Context)(nil),                     // 6: google.cloud.dialogflow.v2.Context
 	(*EventInput)(nil),                  // 7: google.cloud.dialogflow.v2.EventInput
 	(*SessionEntityType)(nil),           // 8: google.cloud.dialogflow.v2.SessionEntityType
diff --git a/dialogflow/apiv2/doc.go b/dialogflow/apiv2/doc.go
index ec9d51a9e3e..42b5c8e8016 100644
--- a/dialogflow/apiv2/doc.go
+++ b/dialogflow/apiv2/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &dialogflowpb.GetAgentRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetAgentRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetAgentRequest.
 //	}
 //	resp, err := c.GetAgent(ctx, req)
 //	if err != nil {
diff --git a/dialogflow/apiv2/documents_client.go b/dialogflow/apiv2/documents_client.go
index 63a67c3e1e3..aafc2dc0ffb 100644
--- a/dialogflow/apiv2/documents_client.go
+++ b/dialogflow/apiv2/documents_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/documents_client_example_test.go b/dialogflow/apiv2/documents_client_example_test.go
index f36335929f4..7d64b0b68b0 100644
--- a/dialogflow/apiv2/documents_client_example_test.go
+++ b/dialogflow/apiv2/documents_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleDocumentsClient_ListDocuments() {
 
 	req := &dialogflowpb.ListDocumentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListDocumentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListDocumentsRequest.
 	}
 	it := c.ListDocuments(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleDocumentsClient_GetDocument() {
 
 	req := &dialogflowpb.GetDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetDocumentRequest.
 	}
 	resp, err := c.GetDocument(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleDocumentsClient_CreateDocument() {
 
 	req := &dialogflowpb.CreateDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateDocumentRequest.
 	}
 	op, err := c.CreateDocument(ctx, req)
 	if err != nil {
@@ -144,7 +144,7 @@ func ExampleDocumentsClient_ImportDocuments() {
 
 	req := &dialogflowpb.ImportDocumentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ImportDocumentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ImportDocumentsRequest.
 	}
 	op, err := c.ImportDocuments(ctx, req)
 	if err != nil {
@@ -174,7 +174,7 @@ func ExampleDocumentsClient_DeleteDocument() {
 
 	req := &dialogflowpb.DeleteDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteDocumentRequest.
 	}
 	op, err := c.DeleteDocument(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleDocumentsClient_UpdateDocument() {
 
 	req := &dialogflowpb.UpdateDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateDocumentRequest.
 	}
 	op, err := c.UpdateDocument(ctx, req)
 	if err != nil {
@@ -232,7 +232,7 @@ func ExampleDocumentsClient_ReloadDocument() {
 
 	req := &dialogflowpb.ReloadDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ReloadDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ReloadDocumentRequest.
 	}
 	op, err := c.ReloadDocument(ctx, req)
 	if err != nil {
@@ -262,7 +262,7 @@ func ExampleDocumentsClient_ExportDocument() {
 
 	req := &dialogflowpb.ExportDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ExportDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ExportDocumentRequest.
 	}
 	op, err := c.ExportDocument(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/entity_types_client.go b/dialogflow/apiv2/entity_types_client.go
index 2ebd47a08bd..5484a307045 100644
--- a/dialogflow/apiv2/entity_types_client.go
+++ b/dialogflow/apiv2/entity_types_client.go
@@ -23,21 +23,21 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
-	structpb "github.com/golang/protobuf/ptypes/struct"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 var newEntityTypesClientHook clientHook
diff --git a/dialogflow/apiv2/entity_types_client_example_test.go b/dialogflow/apiv2/entity_types_client_example_test.go
index 238e2205b9a..46f8a3f0ba7 100644
--- a/dialogflow/apiv2/entity_types_client_example_test.go
+++ b/dialogflow/apiv2/entity_types_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleEntityTypesClient_ListEntityTypes() {
 
 	req := &dialogflowpb.ListEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListEntityTypesRequest.
 	}
 	it := c.ListEntityTypes(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleEntityTypesClient_GetEntityType() {
 
 	req := &dialogflowpb.GetEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetEntityTypeRequest.
 	}
 	resp, err := c.GetEntityType(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleEntityTypesClient_CreateEntityType() {
 
 	req := &dialogflowpb.CreateEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateEntityTypeRequest.
 	}
 	resp, err := c.CreateEntityType(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleEntityTypesClient_UpdateEntityType() {
 
 	req := &dialogflowpb.UpdateEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateEntityTypeRequest.
 	}
 	resp, err := c.UpdateEntityType(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleEntityTypesClient_DeleteEntityType() {
 
 	req := &dialogflowpb.DeleteEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteEntityTypeRequest.
 	}
 	err = c.DeleteEntityType(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleEntityTypesClient_BatchUpdateEntityTypes() {
 
 	req := &dialogflowpb.BatchUpdateEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchUpdateEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchUpdateEntityTypesRequest.
 	}
 	op, err := c.BatchUpdateEntityTypes(ctx, req)
 	if err != nil {
@@ -217,7 +217,7 @@ func ExampleEntityTypesClient_BatchDeleteEntityTypes() {
 
 	req := &dialogflowpb.BatchDeleteEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchDeleteEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchDeleteEntityTypesRequest.
 	}
 	op, err := c.BatchDeleteEntityTypes(ctx, req)
 	if err != nil {
@@ -245,7 +245,7 @@ func ExampleEntityTypesClient_BatchCreateEntities() {
 
 	req := &dialogflowpb.BatchCreateEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchCreateEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchCreateEntitiesRequest.
 	}
 	op, err := c.BatchCreateEntities(ctx, req)
 	if err != nil {
@@ -273,7 +273,7 @@ func ExampleEntityTypesClient_BatchUpdateEntities() {
 
 	req := &dialogflowpb.BatchUpdateEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchUpdateEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchUpdateEntitiesRequest.
 	}
 	op, err := c.BatchUpdateEntities(ctx, req)
 	if err != nil {
@@ -301,7 +301,7 @@ func ExampleEntityTypesClient_BatchDeleteEntities() {
 
 	req := &dialogflowpb.BatchDeleteEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchDeleteEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchDeleteEntitiesRequest.
 	}
 	op, err := c.BatchDeleteEntities(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/environments_client.go b/dialogflow/apiv2/environments_client.go
index aa49b226bad..1cd254cbf89 100644
--- a/dialogflow/apiv2/environments_client.go
+++ b/dialogflow/apiv2/environments_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/environments_client_example_test.go b/dialogflow/apiv2/environments_client_example_test.go
index 649980bd1c3..8910a3ccc3c 100644
--- a/dialogflow/apiv2/environments_client_example_test.go
+++ b/dialogflow/apiv2/environments_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleEnvironmentsClient_ListEnvironments() {
 
 	req := &dialogflowpb.ListEnvironmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListEnvironmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListEnvironmentsRequest.
 	}
 	it := c.ListEnvironments(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleEnvironmentsClient_GetEnvironment() {
 
 	req := &dialogflowpb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleEnvironmentsClient_CreateEnvironment() {
 
 	req := &dialogflowpb.CreateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateEnvironmentRequest.
 	}
 	resp, err := c.CreateEnvironment(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleEnvironmentsClient_UpdateEnvironment() {
 
 	req := &dialogflowpb.UpdateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateEnvironmentRequest.
 	}
 	resp, err := c.UpdateEnvironment(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleEnvironmentsClient_DeleteEnvironment() {
 
 	req := &dialogflowpb.DeleteEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteEnvironmentRequest.
 	}
 	err = c.DeleteEnvironment(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleEnvironmentsClient_GetEnvironmentHistory() {
 
 	req := &dialogflowpb.GetEnvironmentHistoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetEnvironmentHistoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetEnvironmentHistoryRequest.
 	}
 	it := c.GetEnvironmentHistory(ctx, req)
 	for {
diff --git a/dialogflow/apiv2/fulfillments_client.go b/dialogflow/apiv2/fulfillments_client.go
index a5aa421b1f6..d26c3ac62c9 100644
--- a/dialogflow/apiv2/fulfillments_client.go
+++ b/dialogflow/apiv2/fulfillments_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/fulfillments_client_example_test.go b/dialogflow/apiv2/fulfillments_client_example_test.go
index 9959b5dff40..11917d5b6b1 100644
--- a/dialogflow/apiv2/fulfillments_client_example_test.go
+++ b/dialogflow/apiv2/fulfillments_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleFulfillmentsClient_GetFulfillment() {
 
 	req := &dialogflowpb.GetFulfillmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetFulfillmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetFulfillmentRequest.
 	}
 	resp, err := c.GetFulfillment(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleFulfillmentsClient_UpdateFulfillment() {
 
 	req := &dialogflowpb.UpdateFulfillmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateFulfillmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateFulfillmentRequest.
 	}
 	resp, err := c.UpdateFulfillment(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/intents_client.go b/dialogflow/apiv2/intents_client.go
index f23b7ee72c4..3982a6eb253 100644
--- a/dialogflow/apiv2/intents_client.go
+++ b/dialogflow/apiv2/intents_client.go
@@ -23,21 +23,21 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
-	structpb "github.com/golang/protobuf/ptypes/struct"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 var newIntentsClientHook clientHook
diff --git a/dialogflow/apiv2/intents_client_example_test.go b/dialogflow/apiv2/intents_client_example_test.go
index 5f0ff5ae041..4bcdc578208 100644
--- a/dialogflow/apiv2/intents_client_example_test.go
+++ b/dialogflow/apiv2/intents_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleIntentsClient_ListIntents() {
 
 	req := &dialogflowpb.ListIntentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListIntentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListIntentsRequest.
 	}
 	it := c.ListIntents(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleIntentsClient_GetIntent() {
 
 	req := &dialogflowpb.GetIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetIntentRequest.
 	}
 	resp, err := c.GetIntent(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleIntentsClient_CreateIntent() {
 
 	req := &dialogflowpb.CreateIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateIntentRequest.
 	}
 	resp, err := c.CreateIntent(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleIntentsClient_UpdateIntent() {
 
 	req := &dialogflowpb.UpdateIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateIntentRequest.
 	}
 	resp, err := c.UpdateIntent(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleIntentsClient_DeleteIntent() {
 
 	req := &dialogflowpb.DeleteIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteIntentRequest.
 	}
 	err = c.DeleteIntent(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleIntentsClient_BatchUpdateIntents() {
 
 	req := &dialogflowpb.BatchUpdateIntentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchUpdateIntentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchUpdateIntentsRequest.
 	}
 	op, err := c.BatchUpdateIntents(ctx, req)
 	if err != nil {
@@ -217,7 +217,7 @@ func ExampleIntentsClient_BatchDeleteIntents() {
 
 	req := &dialogflowpb.BatchDeleteIntentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchDeleteIntentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchDeleteIntentsRequest.
 	}
 	op, err := c.BatchDeleteIntents(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/knowledge_bases_client.go b/dialogflow/apiv2/knowledge_bases_client.go
index 645ac7ed5b4..8fc9b7f1cf0 100644
--- a/dialogflow/apiv2/knowledge_bases_client.go
+++ b/dialogflow/apiv2/knowledge_bases_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/knowledge_bases_client_example_test.go b/dialogflow/apiv2/knowledge_bases_client_example_test.go
index 7eb72b7dfc7..2c8a4c25677 100644
--- a/dialogflow/apiv2/knowledge_bases_client_example_test.go
+++ b/dialogflow/apiv2/knowledge_bases_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleKnowledgeBasesClient_ListKnowledgeBases() {
 
 	req := &dialogflowpb.ListKnowledgeBasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListKnowledgeBasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListKnowledgeBasesRequest.
 	}
 	it := c.ListKnowledgeBases(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleKnowledgeBasesClient_GetKnowledgeBase() {
 
 	req := &dialogflowpb.GetKnowledgeBaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetKnowledgeBaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetKnowledgeBaseRequest.
 	}
 	resp, err := c.GetKnowledgeBase(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleKnowledgeBasesClient_CreateKnowledgeBase() {
 
 	req := &dialogflowpb.CreateKnowledgeBaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateKnowledgeBaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateKnowledgeBaseRequest.
 	}
 	resp, err := c.CreateKnowledgeBase(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleKnowledgeBasesClient_DeleteKnowledgeBase() {
 
 	req := &dialogflowpb.DeleteKnowledgeBaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteKnowledgeBaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteKnowledgeBaseRequest.
 	}
 	err = c.DeleteKnowledgeBase(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleKnowledgeBasesClient_UpdateKnowledgeBase() {
 
 	req := &dialogflowpb.UpdateKnowledgeBaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateKnowledgeBaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateKnowledgeBaseRequest.
 	}
 	resp, err := c.UpdateKnowledgeBase(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/participants_client.go b/dialogflow/apiv2/participants_client.go
index 4b0fc9274f1..a850fcfdb26 100644
--- a/dialogflow/apiv2/participants_client.go
+++ b/dialogflow/apiv2/participants_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/participants_client_example_test.go b/dialogflow/apiv2/participants_client_example_test.go
index c7c2a7c034b..90a8b2ad498 100644
--- a/dialogflow/apiv2/participants_client_example_test.go
+++ b/dialogflow/apiv2/participants_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleParticipantsClient_CreateParticipant() {
 
 	req := &dialogflowpb.CreateParticipantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateParticipantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateParticipantRequest.
 	}
 	resp, err := c.CreateParticipant(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleParticipantsClient_GetParticipant() {
 
 	req := &dialogflowpb.GetParticipantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetParticipantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetParticipantRequest.
 	}
 	resp, err := c.GetParticipant(ctx, req)
 	if err != nil {
@@ -108,7 +108,7 @@ func ExampleParticipantsClient_ListParticipants() {
 
 	req := &dialogflowpb.ListParticipantsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListParticipantsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListParticipantsRequest.
 	}
 	it := c.ListParticipants(ctx, req)
 	for {
@@ -139,7 +139,7 @@ func ExampleParticipantsClient_UpdateParticipant() {
 
 	req := &dialogflowpb.UpdateParticipantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateParticipantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateParticipantRequest.
 	}
 	resp, err := c.UpdateParticipant(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleParticipantsClient_AnalyzeContent() {
 
 	req := &dialogflowpb.AnalyzeContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#AnalyzeContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#AnalyzeContentRequest.
 	}
 	resp, err := c.AnalyzeContent(ctx, req)
 	if err != nil {
@@ -189,7 +189,7 @@ func ExampleParticipantsClient_SuggestArticles() {
 
 	req := &dialogflowpb.SuggestArticlesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SuggestArticlesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SuggestArticlesRequest.
 	}
 	resp, err := c.SuggestArticles(ctx, req)
 	if err != nil {
@@ -214,7 +214,7 @@ func ExampleParticipantsClient_SuggestFaqAnswers() {
 
 	req := &dialogflowpb.SuggestFaqAnswersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SuggestFaqAnswersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SuggestFaqAnswersRequest.
 	}
 	resp, err := c.SuggestFaqAnswers(ctx, req)
 	if err != nil {
@@ -239,7 +239,7 @@ func ExampleParticipantsClient_SuggestSmartReplies() {
 
 	req := &dialogflowpb.SuggestSmartRepliesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SuggestSmartRepliesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SuggestSmartRepliesRequest.
 	}
 	resp, err := c.SuggestSmartReplies(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/session_entity_types_client.go b/dialogflow/apiv2/session_entity_types_client.go
index 0736e551c9e..7c7d40f69e5 100644
--- a/dialogflow/apiv2/session_entity_types_client.go
+++ b/dialogflow/apiv2/session_entity_types_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/session_entity_types_client_example_test.go b/dialogflow/apiv2/session_entity_types_client_example_test.go
index 76e5488ca9f..af389468753 100644
--- a/dialogflow/apiv2/session_entity_types_client_example_test.go
+++ b/dialogflow/apiv2/session_entity_types_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleSessionEntityTypesClient_ListSessionEntityTypes() {
 
 	req := &dialogflowpb.ListSessionEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListSessionEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListSessionEntityTypesRequest.
 	}
 	it := c.ListSessionEntityTypes(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleSessionEntityTypesClient_GetSessionEntityType() {
 
 	req := &dialogflowpb.GetSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetSessionEntityTypeRequest.
 	}
 	resp, err := c.GetSessionEntityType(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleSessionEntityTypesClient_CreateSessionEntityType() {
 
 	req := &dialogflowpb.CreateSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateSessionEntityTypeRequest.
 	}
 	resp, err := c.CreateSessionEntityType(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleSessionEntityTypesClient_UpdateSessionEntityType() {
 
 	req := &dialogflowpb.UpdateSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateSessionEntityTypeRequest.
 	}
 	resp, err := c.UpdateSessionEntityType(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleSessionEntityTypesClient_DeleteSessionEntityType() {
 
 	req := &dialogflowpb.DeleteSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteSessionEntityTypeRequest.
 	}
 	err = c.DeleteSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/sessions_client.go b/dialogflow/apiv2/sessions_client.go
index 808f699b2a9..32fd691e620 100644
--- a/dialogflow/apiv2/sessions_client.go
+++ b/dialogflow/apiv2/sessions_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/sessions_client_example_test.go b/dialogflow/apiv2/sessions_client_example_test.go
index 263886c2d48..9456253fe9f 100644
--- a/dialogflow/apiv2/sessions_client_example_test.go
+++ b/dialogflow/apiv2/sessions_client_example_test.go
@@ -21,8 +21,8 @@ import (
 	"io"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -59,7 +59,7 @@ func ExampleSessionsClient_DetectIntent() {
 
 	req := &dialogflowpb.DetectIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DetectIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DetectIntentRequest.
 	}
 	resp, err := c.DetectIntent(ctx, req)
 	if err != nil {
diff --git a/dialogflow/apiv2/versions_client.go b/dialogflow/apiv2/versions_client.go
index eab722555d7..54f9e7de37c 100644
--- a/dialogflow/apiv2/versions_client.go
+++ b/dialogflow/apiv2/versions_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/apiv2/versions_client_example_test.go b/dialogflow/apiv2/versions_client_example_test.go
index d1871d1cc21..8b8222c2772 100644
--- a/dialogflow/apiv2/versions_client_example_test.go
+++ b/dialogflow/apiv2/versions_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleVersionsClient_ListVersions() {
 
 	req := &dialogflowpb.ListVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListVersionsRequest.
 	}
 	it := c.ListVersions(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleVersionsClient_GetVersion() {
 
 	req := &dialogflowpb.GetVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetVersionRequest.
 	}
 	resp, err := c.GetVersion(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleVersionsClient_CreateVersion() {
 
 	req := &dialogflowpb.CreateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateVersionRequest.
 	}
 	resp, err := c.CreateVersion(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleVersionsClient_UpdateVersion() {
 
 	req := &dialogflowpb.UpdateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateVersionRequest.
 	}
 	resp, err := c.UpdateVersion(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleVersionsClient_DeleteVersion() {
 
 	req := &dialogflowpb.DeleteVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteVersionRequest.
 	}
 	err = c.DeleteVersion(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/agents_client.go b/dialogflow/cx/apiv3/agents_client.go
index 7d84fe395db..0029a802b6f 100644
--- a/dialogflow/cx/apiv3/agents_client.go
+++ b/dialogflow/cx/apiv3/agents_client.go
@@ -23,21 +23,21 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
-	structpb "github.com/golang/protobuf/ptypes/struct"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 var newAgentsClientHook clientHook
diff --git a/dialogflow/cx/apiv3/agents_client_example_test.go b/dialogflow/cx/apiv3/agents_client_example_test.go
index d5c7c85b3f5..54b2ee7fec9 100644
--- a/dialogflow/cx/apiv3/agents_client_example_test.go
+++ b/dialogflow/cx/apiv3/agents_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleAgentsClient_ListAgents() {
 
 	req := &cxpb.ListAgentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListAgentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListAgentsRequest.
 	}
 	it := c.ListAgents(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleAgentsClient_GetAgent() {
 
 	req := &cxpb.GetAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetAgentRequest.
 	}
 	resp, err := c.GetAgent(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleAgentsClient_CreateAgent() {
 
 	req := &cxpb.CreateAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateAgentRequest.
 	}
 	resp, err := c.CreateAgent(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleAgentsClient_UpdateAgent() {
 
 	req := &cxpb.UpdateAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateAgentRequest.
 	}
 	resp, err := c.UpdateAgent(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleAgentsClient_DeleteAgent() {
 
 	req := &cxpb.DeleteAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteAgentRequest.
 	}
 	err = c.DeleteAgent(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleAgentsClient_ExportAgent() {
 
 	req := &cxpb.ExportAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ExportAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ExportAgentRequest.
 	}
 	op, err := c.ExportAgent(ctx, req)
 	if err != nil {
@@ -217,7 +217,7 @@ func ExampleAgentsClient_RestoreAgent() {
 
 	req := &cxpb.RestoreAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#RestoreAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#RestoreAgentRequest.
 	}
 	op, err := c.RestoreAgent(ctx, req)
 	if err != nil {
@@ -245,7 +245,7 @@ func ExampleAgentsClient_ValidateAgent() {
 
 	req := &cxpb.ValidateAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ValidateAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ValidateAgentRequest.
 	}
 	resp, err := c.ValidateAgent(ctx, req)
 	if err != nil {
@@ -270,7 +270,7 @@ func ExampleAgentsClient_GetAgentValidationResult() {
 
 	req := &cxpb.GetAgentValidationResultRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetAgentValidationResultRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetAgentValidationResultRequest.
 	}
 	resp, err := c.GetAgentValidationResult(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/changelogs_client.go b/dialogflow/cx/apiv3/changelogs_client.go
index a0a3c20819d..71399df7646 100644
--- a/dialogflow/cx/apiv3/changelogs_client.go
+++ b/dialogflow/cx/apiv3/changelogs_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/changelogs_client_example_test.go b/dialogflow/cx/apiv3/changelogs_client_example_test.go
index 7f96c50c128..1cc0ec67469 100644
--- a/dialogflow/cx/apiv3/changelogs_client_example_test.go
+++ b/dialogflow/cx/apiv3/changelogs_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleChangelogsClient_ListChangelogs() {
 
 	req := &cxpb.ListChangelogsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListChangelogsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListChangelogsRequest.
 	}
 	it := c.ListChangelogs(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleChangelogsClient_GetChangelog() {
 
 	req := &cxpb.GetChangelogRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetChangelogRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetChangelogRequest.
 	}
 	resp, err := c.GetChangelog(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/cxpb/advanced_settings.pb.go b/dialogflow/cx/apiv3/cxpb/advanced_settings.pb.go
index f473a5c68c6..b0af7ace2db 100644
--- a/dialogflow/cx/apiv3/cxpb/advanced_settings.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/advanced_settings.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/advanced_settings.proto
 
 package cxpb
diff --git a/dialogflow/cx/apiv3/cxpb/agent.pb.go b/dialogflow/cx/apiv3/cxpb/agent.pb.go
index 0c617626450..6b68fef1c3d 100644
--- a/dialogflow/cx/apiv3/cxpb/agent.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/agent.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/agent.proto
 
 package cxpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -646,7 +646,7 @@ type UpdateAgentRequest struct {
 	Agent *Agent `protobuf:"bytes,1,opt,name=agent,proto3" json:"agent,omitempty"`
 	// The mask to control which fields get updated. If the mask is not present,
 	// all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAgentRequest) Reset() {
@@ -688,7 +688,7 @@ func (x *UpdateAgentRequest) GetAgent() *Agent {
 	return nil
 }
 
-func (x *UpdateAgentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAgentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1591,9 +1591,9 @@ var file_google_cloud_dialogflow_cx_v3_agent_proto_goTypes = []interface{}{
 	(*GetAgentValidationResultRequest)(nil), // 14: google.cloud.dialogflow.cx.v3.GetAgentValidationResultRequest
 	(*AgentValidationResult)(nil),           // 15: google.cloud.dialogflow.cx.v3.AgentValidationResult
 	(*AdvancedSettings)(nil),                // 16: google.cloud.dialogflow.cx.v3.AdvancedSettings
-	(*field_mask.FieldMask)(nil),            // 17: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),           // 17: google.protobuf.FieldMask
 	(*FlowValidationResult)(nil),            // 18: google.cloud.dialogflow.cx.v3.FlowValidationResult
-	(*empty.Empty)(nil),                     // 19: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                   // 19: google.protobuf.Empty
 	(*longrunning.Operation)(nil),           // 20: google.longrunning.Operation
 }
 var file_google_cloud_dialogflow_cx_v3_agent_proto_depIdxs = []int32{
@@ -1866,7 +1866,7 @@ type AgentsClient interface {
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
 	UpdateAgent(ctx context.Context, in *UpdateAgentRequest, opts ...grpc.CallOption) (*Agent, error)
 	// Deletes the specified agent.
-	DeleteAgent(ctx context.Context, in *DeleteAgentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAgent(ctx context.Context, in *DeleteAgentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Exports the specified agent to a binary file.
 	//
 	// This method is a [long-running
@@ -1948,8 +1948,8 @@ func (c *agentsClient) UpdateAgent(ctx context.Context, in *UpdateAgentRequest,
 	return out, nil
 }
 
-func (c *agentsClient) DeleteAgent(ctx context.Context, in *DeleteAgentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *agentsClient) DeleteAgent(ctx context.Context, in *DeleteAgentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.Agents/DeleteAgent", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2012,7 +2012,7 @@ type AgentsServer interface {
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
 	UpdateAgent(context.Context, *UpdateAgentRequest) (*Agent, error)
 	// Deletes the specified agent.
-	DeleteAgent(context.Context, *DeleteAgentRequest) (*empty.Empty, error)
+	DeleteAgent(context.Context, *DeleteAgentRequest) (*emptypb.Empty, error)
 	// Exports the specified agent to a binary file.
 	//
 	// This method is a [long-running
@@ -2066,7 +2066,7 @@ func (*UnimplementedAgentsServer) CreateAgent(context.Context, *CreateAgentReque
 func (*UnimplementedAgentsServer) UpdateAgent(context.Context, *UpdateAgentRequest) (*Agent, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateAgent not implemented")
 }
-func (*UnimplementedAgentsServer) DeleteAgent(context.Context, *DeleteAgentRequest) (*empty.Empty, error) {
+func (*UnimplementedAgentsServer) DeleteAgent(context.Context, *DeleteAgentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAgent not implemented")
 }
 func (*UnimplementedAgentsServer) ExportAgent(context.Context, *ExportAgentRequest) (*longrunning.Operation, error) {
diff --git a/dialogflow/cx/apiv3/cxpb/audio_config.pb.go b/dialogflow/cx/apiv3/cxpb/audio_config.pb.go
index 814b5ae1fd4..272bf4b4a31 100644
--- a/dialogflow/cx/apiv3/cxpb/audio_config.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/audio_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/audio_config.proto
 
 package cxpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -356,11 +356,11 @@ type SpeechWordInfo struct {
 	// Time offset relative to the beginning of the audio that corresponds to the
 	// start of the spoken word. This is an experimental feature and the accuracy
 	// of the time offset can vary.
-	StartOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_offset,json=startOffset,proto3" json:"start_offset,omitempty"`
+	StartOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=start_offset,json=startOffset,proto3" json:"start_offset,omitempty"`
 	// Time offset relative to the beginning of the audio that corresponds to the
 	// end of the spoken word. This is an experimental feature and the accuracy of
 	// the time offset can vary.
-	EndOffset *duration.Duration `protobuf:"bytes,2,opt,name=end_offset,json=endOffset,proto3" json:"end_offset,omitempty"`
+	EndOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=end_offset,json=endOffset,proto3" json:"end_offset,omitempty"`
 	// The Speech confidence between 0.0 and 1.0 for this word. A higher number
 	// indicates an estimated greater likelihood that the recognized word is
 	// correct. The default of 0.0 is a sentinel value indicating that confidence
@@ -410,14 +410,14 @@ func (x *SpeechWordInfo) GetWord() string {
 	return ""
 }
 
-func (x *SpeechWordInfo) GetStartOffset() *duration.Duration {
+func (x *SpeechWordInfo) GetStartOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartOffset
 	}
 	return nil
 }
 
-func (x *SpeechWordInfo) GetEndOffset() *duration.Duration {
+func (x *SpeechWordInfo) GetEndOffset() *durationpb.Duration {
 	if x != nil {
 		return x.EndOffset
 	}
@@ -983,7 +983,7 @@ var file_google_cloud_dialogflow_cx_v3_audio_config_proto_goTypes = []interface{
 	(*VoiceSelectionParams)(nil),   // 6: google.cloud.dialogflow.cx.v3.VoiceSelectionParams
 	(*SynthesizeSpeechConfig)(nil), // 7: google.cloud.dialogflow.cx.v3.SynthesizeSpeechConfig
 	(*OutputAudioConfig)(nil),      // 8: google.cloud.dialogflow.cx.v3.OutputAudioConfig
-	(*duration.Duration)(nil),      // 9: google.protobuf.Duration
+	(*durationpb.Duration)(nil),    // 9: google.protobuf.Duration
 }
 var file_google_cloud_dialogflow_cx_v3_audio_config_proto_depIdxs = []int32{
 	9, // 0: google.cloud.dialogflow.cx.v3.SpeechWordInfo.start_offset:type_name -> google.protobuf.Duration
diff --git a/dialogflow/cx/apiv3/cxpb/changelog.pb.go b/dialogflow/cx/apiv3/cxpb/changelog.pb.go
index 510a0601f08..50914874d02 100644
--- a/dialogflow/cx/apiv3/cxpb/changelog.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/changelog.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/changelog.proto
 
 package cxpb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -271,7 +271,7 @@ type Changelog struct {
 	// The affected resource name of the change.
 	Resource string `protobuf:"bytes,3,opt,name=resource,proto3" json:"resource,omitempty"`
 	// The timestamp of the change.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *Changelog) Reset() {
@@ -348,7 +348,7 @@ func (x *Changelog) GetResource() string {
 	return ""
 }
 
-func (x *Changelog) GetCreateTime() *timestamp.Timestamp {
+func (x *Changelog) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -486,7 +486,7 @@ var file_google_cloud_dialogflow_cx_v3_changelog_proto_goTypes = []interface{}{
 	(*ListChangelogsResponse)(nil), // 1: google.cloud.dialogflow.cx.v3.ListChangelogsResponse
 	(*GetChangelogRequest)(nil),    // 2: google.cloud.dialogflow.cx.v3.GetChangelogRequest
 	(*Changelog)(nil),              // 3: google.cloud.dialogflow.cx.v3.Changelog
-	(*timestamp.Timestamp)(nil),    // 4: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),  // 4: google.protobuf.Timestamp
 }
 var file_google_cloud_dialogflow_cx_v3_changelog_proto_depIdxs = []int32{
 	3, // 0: google.cloud.dialogflow.cx.v3.ListChangelogsResponse.changelogs:type_name -> google.cloud.dialogflow.cx.v3.Changelog
diff --git a/dialogflow/cx/apiv3/cxpb/deployment.pb.go b/dialogflow/cx/apiv3/cxpb/deployment.pb.go
index 414b0be73d2..c57a634a02f 100644
--- a/dialogflow/cx/apiv3/cxpb/deployment.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/deployment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/deployment.proto
 
 package cxpb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -120,9 +120,9 @@ type Deployment struct {
 	// Result of the deployment.
 	Result *Deployment_Result `protobuf:"bytes,4,opt,name=result,proto3" json:"result,omitempty"`
 	// Start time of this deployment.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of this deployment.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *Deployment) Reset() {
@@ -185,14 +185,14 @@ func (x *Deployment) GetResult() *Deployment_Result {
 	return nil
 }
 
-func (x *Deployment) GetStartTime() *timestamp.Timestamp {
+func (x *Deployment) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Deployment) GetEndTime() *timestamp.Timestamp {
+func (x *Deployment) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -606,7 +606,7 @@ var file_google_cloud_dialogflow_cx_v3_deployment_proto_goTypes = []interface{}{
 	(*ListDeploymentsResponse)(nil), // 3: google.cloud.dialogflow.cx.v3.ListDeploymentsResponse
 	(*GetDeploymentRequest)(nil),    // 4: google.cloud.dialogflow.cx.v3.GetDeploymentRequest
 	(*Deployment_Result)(nil),       // 5: google.cloud.dialogflow.cx.v3.Deployment.Result
-	(*timestamp.Timestamp)(nil),     // 6: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),   // 6: google.protobuf.Timestamp
 }
 var file_google_cloud_dialogflow_cx_v3_deployment_proto_depIdxs = []int32{
 	0, // 0: google.cloud.dialogflow.cx.v3.Deployment.state:type_name -> google.cloud.dialogflow.cx.v3.Deployment.State
diff --git a/dialogflow/cx/apiv3/cxpb/entity_type.pb.go b/dialogflow/cx/apiv3/cxpb/entity_type.pb.go
index 122c785adb5..37493b6dbb9 100644
--- a/dialogflow/cx/apiv3/cxpb/entity_type.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/entity_type.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/entity_type.proto
 
 package cxpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -621,7 +621,7 @@ type UpdateEntityTypeRequest struct {
 	// Note: languages must be enabled in the agent before they can be used.
 	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateEntityTypeRequest) Reset() {
@@ -670,7 +670,7 @@ func (x *UpdateEntityTypeRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (x *UpdateEntityTypeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEntityTypeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1124,8 +1124,8 @@ var file_google_cloud_dialogflow_cx_v3_entity_type_proto_goTypes = []interface{}
 	(*DeleteEntityTypeRequest)(nil),   // 8: google.cloud.dialogflow.cx.v3.DeleteEntityTypeRequest
 	(*EntityType_Entity)(nil),         // 9: google.cloud.dialogflow.cx.v3.EntityType.Entity
 	(*EntityType_ExcludedPhrase)(nil), // 10: google.cloud.dialogflow.cx.v3.EntityType.ExcludedPhrase
-	(*field_mask.FieldMask)(nil),      // 11: google.protobuf.FieldMask
-	(*empty.Empty)(nil),               // 12: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),     // 11: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),             // 12: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_entity_type_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.dialogflow.cx.v3.EntityType.kind:type_name -> google.cloud.dialogflow.cx.v3.EntityType.Kind
@@ -1322,7 +1322,7 @@ type EntityTypesClient interface {
 	// Note: You should always train a flow prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
-	DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type entityTypesClient struct {
@@ -1369,8 +1369,8 @@ func (c *entityTypesClient) UpdateEntityType(ctx context.Context, in *UpdateEnti
 	return out, nil
 }
 
-func (c *entityTypesClient) DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *entityTypesClient) DeleteEntityType(ctx context.Context, in *DeleteEntityTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.EntityTypes/DeleteEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1401,7 +1401,7 @@ type EntityTypesServer interface {
 	// Note: You should always train a flow prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
-	DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*empty.Empty, error)
+	DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedEntityTypesServer can be embedded to have forward compatible implementations.
@@ -1420,7 +1420,7 @@ func (*UnimplementedEntityTypesServer) CreateEntityType(context.Context, *Create
 func (*UnimplementedEntityTypesServer) UpdateEntityType(context.Context, *UpdateEntityTypeRequest) (*EntityType, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEntityType not implemented")
 }
-func (*UnimplementedEntityTypesServer) DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*empty.Empty, error) {
+func (*UnimplementedEntityTypesServer) DeleteEntityType(context.Context, *DeleteEntityTypeRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEntityType not implemented")
 }
 
diff --git a/dialogflow/cx/apiv3/cxpb/environment.pb.go b/dialogflow/cx/apiv3/cxpb/environment.pb.go
index 2139f0b345e..67e91c8cc28 100644
--- a/dialogflow/cx/apiv3/cxpb/environment.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/environment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/environment.proto
 
 package cxpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -126,7 +126,7 @@ type Environment struct {
 	// returned.
 	VersionConfigs []*Environment_VersionConfig `protobuf:"bytes,6,rep,name=version_configs,json=versionConfigs,proto3" json:"version_configs,omitempty"`
 	// Output only. Update time of this environment.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The test cases config for continuous tests of this environment.
 	TestCasesConfig *Environment_TestCasesConfig `protobuf:"bytes,7,opt,name=test_cases_config,json=testCasesConfig,proto3" json:"test_cases_config,omitempty"`
 	// The webhook configuration for this environment.
@@ -193,7 +193,7 @@ func (x *Environment) GetVersionConfigs() []*Environment_VersionConfig {
 	return nil
 }
 
-func (x *Environment) GetUpdateTime() *timestamp.Timestamp {
+func (x *Environment) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -464,7 +464,7 @@ type UpdateEnvironmentRequest struct {
 	// Required. The environment to update.
 	Environment *Environment `protobuf:"bytes,1,opt,name=environment,proto3" json:"environment,omitempty"`
 	// Required. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateEnvironmentRequest) Reset() {
@@ -506,7 +506,7 @@ func (x *UpdateEnvironmentRequest) GetEnvironment() *Environment {
 	return nil
 }
 
-func (x *UpdateEnvironmentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEnvironmentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -711,7 +711,7 @@ type ContinuousTestResult struct {
 	// A list of individual test case results names in this continuous test run.
 	TestCaseResults []string `protobuf:"bytes,3,rep,name=test_case_results,json=testCaseResults,proto3" json:"test_case_results,omitempty"`
 	// Time when the continuous testing run starts.
-	RunTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=run_time,json=runTime,proto3" json:"run_time,omitempty"`
+	RunTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=run_time,json=runTime,proto3" json:"run_time,omitempty"`
 }
 
 func (x *ContinuousTestResult) Reset() {
@@ -767,7 +767,7 @@ func (x *ContinuousTestResult) GetTestCaseResults() []string {
 	return nil
 }
 
-func (x *ContinuousTestResult) GetRunTime() *timestamp.Timestamp {
+func (x *ContinuousTestResult) GetRunTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RunTime
 	}
@@ -1860,12 +1860,12 @@ var file_google_cloud_dialogflow_cx_v3_environment_proto_goTypes = []interface{}
 	(*Environment_VersionConfig)(nil),              // 19: google.cloud.dialogflow.cx.v3.Environment.VersionConfig
 	(*Environment_TestCasesConfig)(nil),            // 20: google.cloud.dialogflow.cx.v3.Environment.TestCasesConfig
 	(*Environment_WebhookConfig)(nil),              // 21: google.cloud.dialogflow.cx.v3.Environment.WebhookConfig
-	(*timestamp.Timestamp)(nil),                    // 22: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                   // 23: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                  // 22: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                  // 23: google.protobuf.FieldMask
 	(*TestError)(nil),                              // 24: google.cloud.dialogflow.cx.v3.TestError
 	(*Webhook)(nil),                                // 25: google.cloud.dialogflow.cx.v3.Webhook
 	(*longrunning.Operation)(nil),                  // 26: google.longrunning.Operation
-	(*empty.Empty)(nil),                            // 27: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                          // 27: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_environment_proto_depIdxs = []int32{
 	19, // 0: google.cloud.dialogflow.cx.v3.Environment.version_configs:type_name -> google.cloud.dialogflow.cx.v3.Environment.VersionConfig
@@ -2229,7 +2229,7 @@ type EnvironmentsClient interface {
 	//   - `response`: [Environment][google.cloud.dialogflow.cx.v3.Environment]
 	UpdateEnvironment(ctx context.Context, in *UpdateEnvironmentRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes the specified [Environment][google.cloud.dialogflow.cx.v3.Environment].
-	DeleteEnvironment(ctx context.Context, in *DeleteEnvironmentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEnvironment(ctx context.Context, in *DeleteEnvironmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Looks up the history of the specified [Environment][google.cloud.dialogflow.cx.v3.Environment].
 	LookupEnvironmentHistory(ctx context.Context, in *LookupEnvironmentHistoryRequest, opts ...grpc.CallOption) (*LookupEnvironmentHistoryResponse, error)
 	// Kicks off a continuous test under the specified [Environment][google.cloud.dialogflow.cx.v3.Environment].
@@ -2298,8 +2298,8 @@ func (c *environmentsClient) UpdateEnvironment(ctx context.Context, in *UpdateEn
 	return out, nil
 }
 
-func (c *environmentsClient) DeleteEnvironment(ctx context.Context, in *DeleteEnvironmentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *environmentsClient) DeleteEnvironment(ctx context.Context, in *DeleteEnvironmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.Environments/DeleteEnvironment", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2370,7 +2370,7 @@ type EnvironmentsServer interface {
 	//   - `response`: [Environment][google.cloud.dialogflow.cx.v3.Environment]
 	UpdateEnvironment(context.Context, *UpdateEnvironmentRequest) (*longrunning.Operation, error)
 	// Deletes the specified [Environment][google.cloud.dialogflow.cx.v3.Environment].
-	DeleteEnvironment(context.Context, *DeleteEnvironmentRequest) (*empty.Empty, error)
+	DeleteEnvironment(context.Context, *DeleteEnvironmentRequest) (*emptypb.Empty, error)
 	// Looks up the history of the specified [Environment][google.cloud.dialogflow.cx.v3.Environment].
 	LookupEnvironmentHistory(context.Context, *LookupEnvironmentHistoryRequest) (*LookupEnvironmentHistoryResponse, error)
 	// Kicks off a continuous test under the specified [Environment][google.cloud.dialogflow.cx.v3.Environment].
@@ -2411,7 +2411,7 @@ func (*UnimplementedEnvironmentsServer) CreateEnvironment(context.Context, *Crea
 func (*UnimplementedEnvironmentsServer) UpdateEnvironment(context.Context, *UpdateEnvironmentRequest) (*longrunning.Operation, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEnvironment not implemented")
 }
-func (*UnimplementedEnvironmentsServer) DeleteEnvironment(context.Context, *DeleteEnvironmentRequest) (*empty.Empty, error) {
+func (*UnimplementedEnvironmentsServer) DeleteEnvironment(context.Context, *DeleteEnvironmentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEnvironment not implemented")
 }
 func (*UnimplementedEnvironmentsServer) LookupEnvironmentHistory(context.Context, *LookupEnvironmentHistoryRequest) (*LookupEnvironmentHistoryResponse, error) {
diff --git a/dialogflow/cx/apiv3/cxpb/experiment.pb.go b/dialogflow/cx/apiv3/cxpb/experiment.pb.go
index 3e8d2afb379..6c7ad900f9b 100644
--- a/dialogflow/cx/apiv3/cxpb/experiment.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/experiment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/experiment.proto
 
 package cxpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -264,17 +264,17 @@ type Experiment struct {
 	// Inference result of the experiment.
 	Result *Experiment_Result `protobuf:"bytes,6,opt,name=result,proto3" json:"result,omitempty"`
 	// Creation time of this experiment.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Start time of this experiment.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of this experiment.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Last update time of this experiment.
-	LastUpdateTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
+	LastUpdateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
 	// Maximum number of days to run the experiment/rollout. If auto-rollout is
 	// not enabled, default value and maximum will be 30 days. If auto-rollout is
 	// enabled, default value and maximum will be 6 days.
-	ExperimentLength *duration.Duration `protobuf:"bytes,11,opt,name=experiment_length,json=experimentLength,proto3" json:"experiment_length,omitempty"`
+	ExperimentLength *durationpb.Duration `protobuf:"bytes,11,opt,name=experiment_length,json=experimentLength,proto3" json:"experiment_length,omitempty"`
 	// The history of updates to the experiment variants.
 	VariantsHistory []*VariantsHistory `protobuf:"bytes,12,rep,name=variants_history,json=variantsHistory,proto3" json:"variants_history,omitempty"`
 }
@@ -374,35 +374,35 @@ func (x *Experiment) GetResult() *Experiment_Result {
 	return nil
 }
 
-func (x *Experiment) GetCreateTime() *timestamp.Timestamp {
+func (x *Experiment) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Experiment) GetStartTime() *timestamp.Timestamp {
+func (x *Experiment) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Experiment) GetEndTime() *timestamp.Timestamp {
+func (x *Experiment) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
 	return nil
 }
 
-func (x *Experiment) GetLastUpdateTime() *timestamp.Timestamp {
+func (x *Experiment) GetLastUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastUpdateTime
 	}
 	return nil
 }
 
-func (x *Experiment) GetExperimentLength() *duration.Duration {
+func (x *Experiment) GetExperimentLength() *durationpb.Duration {
 	if x != nil {
 		return x.ExperimentLength
 	}
@@ -479,7 +479,7 @@ type VariantsHistory struct {
 	//	*VariantsHistory_VersionVariants
 	Variants isVariantsHistory_Variants `protobuf_oneof:"variants"`
 	// Update time of the variants.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *VariantsHistory) Reset() {
@@ -528,7 +528,7 @@ func (x *VariantsHistory) GetVersionVariants() *VersionVariants {
 	return nil
 }
 
-func (x *VariantsHistory) GetUpdateTime() *timestamp.Timestamp {
+func (x *VariantsHistory) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -632,7 +632,7 @@ type RolloutState struct {
 	// Index of the current step in the auto rollout steps list.
 	StepIndex int32 `protobuf:"varint,3,opt,name=step_index,json=stepIndex,proto3" json:"step_index,omitempty"`
 	// Start time of the current step.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 }
 
 func (x *RolloutState) Reset() {
@@ -681,7 +681,7 @@ func (x *RolloutState) GetStepIndex() int32 {
 	return 0
 }
 
-func (x *RolloutState) GetStartTime() *timestamp.Timestamp {
+func (x *RolloutState) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -940,7 +940,7 @@ type UpdateExperimentRequest struct {
 	// Required. The experiment to update.
 	Experiment *Experiment `protobuf:"bytes,1,opt,name=experiment,proto3" json:"experiment,omitempty"`
 	// Required. The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateExperimentRequest) Reset() {
@@ -982,7 +982,7 @@ func (x *UpdateExperimentRequest) GetExperiment() *Experiment {
 	return nil
 }
 
-func (x *UpdateExperimentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateExperimentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1237,7 +1237,7 @@ type Experiment_Result struct {
 	VersionMetrics []*Experiment_Result_VersionMetrics `protobuf:"bytes,1,rep,name=version_metrics,json=versionMetrics,proto3" json:"version_metrics,omitempty"`
 	// The last time the experiment's stats data was updated. Will have default
 	// value if stats have never been computed for this experiment.
-	LastUpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
+	LastUpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
 }
 
 func (x *Experiment_Result) Reset() {
@@ -1279,7 +1279,7 @@ func (x *Experiment_Result) GetVersionMetrics() []*Experiment_Result_VersionMetr
 	return nil
 }
 
-func (x *Experiment_Result) GetLastUpdateTime() *timestamp.Timestamp {
+func (x *Experiment_Result) GetLastUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastUpdateTime
 	}
@@ -1635,7 +1635,7 @@ type RolloutConfig_RolloutStep struct {
 	// The minimum time that this step should last. Should be longer than 1
 	// hour. If not set, the default minimum duration for each step will be 1
 	// hour.
-	MinDuration *duration.Duration `protobuf:"bytes,3,opt,name=min_duration,json=minDuration,proto3" json:"min_duration,omitempty"`
+	MinDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=min_duration,json=minDuration,proto3" json:"min_duration,omitempty"`
 }
 
 func (x *RolloutConfig_RolloutStep) Reset() {
@@ -1684,7 +1684,7 @@ func (x *RolloutConfig_RolloutStep) GetTrafficPercent() int32 {
 	return 0
 }
 
-func (x *RolloutConfig_RolloutStep) GetMinDuration() *duration.Duration {
+func (x *RolloutConfig_RolloutStep) GetMinDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MinDuration
 	}
@@ -2151,10 +2151,10 @@ var file_google_cloud_dialogflow_cx_v3_experiment_proto_goTypes = []interface{}{
 	(*Experiment_Result_VersionMetrics)(nil),     // 20: google.cloud.dialogflow.cx.v3.Experiment.Result.VersionMetrics
 	(*VersionVariants_Variant)(nil),              // 21: google.cloud.dialogflow.cx.v3.VersionVariants.Variant
 	(*RolloutConfig_RolloutStep)(nil),            // 22: google.cloud.dialogflow.cx.v3.RolloutConfig.RolloutStep
-	(*timestamp.Timestamp)(nil),                  // 23: google.protobuf.Timestamp
-	(*duration.Duration)(nil),                    // 24: google.protobuf.Duration
-	(*field_mask.FieldMask)(nil),                 // 25: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                          // 26: google.protobuf.Empty
+	(*timestamppb.Timestamp)(nil),                // 23: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                  // 24: google.protobuf.Duration
+	(*fieldmaskpb.FieldMask)(nil),                // 25: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                        // 26: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_experiment_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.dialogflow.cx.v3.Experiment.state:type_name -> google.cloud.dialogflow.cx.v3.Experiment.State
@@ -2505,7 +2505,7 @@ type ExperimentsClient interface {
 	// Updates the specified [Experiment][google.cloud.dialogflow.cx.v3.Experiment].
 	UpdateExperiment(ctx context.Context, in *UpdateExperimentRequest, opts ...grpc.CallOption) (*Experiment, error)
 	// Deletes the specified [Experiment][google.cloud.dialogflow.cx.v3.Experiment].
-	DeleteExperiment(ctx context.Context, in *DeleteExperimentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteExperiment(ctx context.Context, in *DeleteExperimentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Starts the specified [Experiment][google.cloud.dialogflow.cx.v3.Experiment]. This rpc only changes the state of
 	// experiment from PENDING to RUNNING.
 	StartExperiment(ctx context.Context, in *StartExperimentRequest, opts ...grpc.CallOption) (*Experiment, error)
@@ -2558,8 +2558,8 @@ func (c *experimentsClient) UpdateExperiment(ctx context.Context, in *UpdateExpe
 	return out, nil
 }
 
-func (c *experimentsClient) DeleteExperiment(ctx context.Context, in *DeleteExperimentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *experimentsClient) DeleteExperiment(ctx context.Context, in *DeleteExperimentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.Experiments/DeleteExperiment", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2596,7 +2596,7 @@ type ExperimentsServer interface {
 	// Updates the specified [Experiment][google.cloud.dialogflow.cx.v3.Experiment].
 	UpdateExperiment(context.Context, *UpdateExperimentRequest) (*Experiment, error)
 	// Deletes the specified [Experiment][google.cloud.dialogflow.cx.v3.Experiment].
-	DeleteExperiment(context.Context, *DeleteExperimentRequest) (*empty.Empty, error)
+	DeleteExperiment(context.Context, *DeleteExperimentRequest) (*emptypb.Empty, error)
 	// Starts the specified [Experiment][google.cloud.dialogflow.cx.v3.Experiment]. This rpc only changes the state of
 	// experiment from PENDING to RUNNING.
 	StartExperiment(context.Context, *StartExperimentRequest) (*Experiment, error)
@@ -2621,7 +2621,7 @@ func (*UnimplementedExperimentsServer) CreateExperiment(context.Context, *Create
 func (*UnimplementedExperimentsServer) UpdateExperiment(context.Context, *UpdateExperimentRequest) (*Experiment, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateExperiment not implemented")
 }
-func (*UnimplementedExperimentsServer) DeleteExperiment(context.Context, *DeleteExperimentRequest) (*empty.Empty, error) {
+func (*UnimplementedExperimentsServer) DeleteExperiment(context.Context, *DeleteExperimentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteExperiment not implemented")
 }
 func (*UnimplementedExperimentsServer) StartExperiment(context.Context, *StartExperimentRequest) (*Experiment, error) {
diff --git a/dialogflow/cx/apiv3/cxpb/flow.pb.go b/dialogflow/cx/apiv3/cxpb/flow.pb.go
index 4317a19f396..f8bbe6ce106 100644
--- a/dialogflow/cx/apiv3/cxpb/flow.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/flow.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/flow.proto
 
 package cxpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -815,7 +815,7 @@ type UpdateFlowRequest struct {
 	Flow *Flow `protobuf:"bytes,1,opt,name=flow,proto3" json:"flow,omitempty"`
 	// The mask to control which fields get updated. If the mask is not present,
 	// all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// The language of the following fields in `flow`:
 	//
 	// *  `Flow.event_handlers.trigger_fulfillment.messages`
@@ -870,7 +870,7 @@ func (x *UpdateFlowRequest) GetFlow() *Flow {
 	return nil
 }
 
-func (x *UpdateFlowRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateFlowRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1068,7 +1068,7 @@ type FlowValidationResult struct {
 	// Contains all validation messages.
 	ValidationMessages []*ValidationMessage `protobuf:"bytes,2,rep,name=validation_messages,json=validationMessages,proto3" json:"validation_messages,omitempty"`
 	// Last time the flow was validated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *FlowValidationResult) Reset() {
@@ -1117,7 +1117,7 @@ func (x *FlowValidationResult) GetValidationMessages() []*ValidationMessage {
 	return nil
 }
 
-func (x *FlowValidationResult) GetUpdateTime() *timestamp.Timestamp {
+func (x *FlowValidationResult) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1871,10 +1871,10 @@ var file_google_cloud_dialogflow_cx_v3_flow_proto_goTypes = []interface{}{
 	(*ExportFlowResponse)(nil),             // 18: google.cloud.dialogflow.cx.v3.ExportFlowResponse
 	(*TransitionRoute)(nil),                // 19: google.cloud.dialogflow.cx.v3.TransitionRoute
 	(*EventHandler)(nil),                   // 20: google.cloud.dialogflow.cx.v3.EventHandler
-	(*field_mask.FieldMask)(nil),           // 21: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),          // 21: google.protobuf.FieldMask
 	(*ValidationMessage)(nil),              // 22: google.cloud.dialogflow.cx.v3.ValidationMessage
-	(*timestamp.Timestamp)(nil),            // 23: google.protobuf.Timestamp
-	(*empty.Empty)(nil),                    // 24: google.protobuf.Empty
+	(*timestamppb.Timestamp)(nil),          // 23: google.protobuf.Timestamp
+	(*emptypb.Empty)(nil),                  // 24: google.protobuf.Empty
 	(*longrunning.Operation)(nil),          // 25: google.longrunning.Operation
 }
 var file_google_cloud_dialogflow_cx_v3_flow_proto_depIdxs = []int32{
@@ -2166,7 +2166,7 @@ type FlowsClient interface {
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
 	CreateFlow(ctx context.Context, in *CreateFlowRequest, opts ...grpc.CallOption) (*Flow, error)
 	// Deletes a specified flow.
-	DeleteFlow(ctx context.Context, in *DeleteFlowRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteFlow(ctx context.Context, in *DeleteFlowRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Returns the list of all flows in the specified agent.
 	ListFlows(ctx context.Context, in *ListFlowsRequest, opts ...grpc.CallOption) (*ListFlowsResponse, error)
 	// Retrieves the specified flow.
@@ -2246,8 +2246,8 @@ func (c *flowsClient) CreateFlow(ctx context.Context, in *CreateFlowRequest, opt
 	return out, nil
 }
 
-func (c *flowsClient) DeleteFlow(ctx context.Context, in *DeleteFlowRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *flowsClient) DeleteFlow(ctx context.Context, in *DeleteFlowRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.Flows/DeleteFlow", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2336,7 +2336,7 @@ type FlowsServer interface {
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
 	CreateFlow(context.Context, *CreateFlowRequest) (*Flow, error)
 	// Deletes a specified flow.
-	DeleteFlow(context.Context, *DeleteFlowRequest) (*empty.Empty, error)
+	DeleteFlow(context.Context, *DeleteFlowRequest) (*emptypb.Empty, error)
 	// Returns the list of all flows in the specified agent.
 	ListFlows(context.Context, *ListFlowsRequest) (*ListFlowsResponse, error)
 	// Retrieves the specified flow.
@@ -2406,7 +2406,7 @@ type UnimplementedFlowsServer struct {
 func (*UnimplementedFlowsServer) CreateFlow(context.Context, *CreateFlowRequest) (*Flow, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateFlow not implemented")
 }
-func (*UnimplementedFlowsServer) DeleteFlow(context.Context, *DeleteFlowRequest) (*empty.Empty, error) {
+func (*UnimplementedFlowsServer) DeleteFlow(context.Context, *DeleteFlowRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteFlow not implemented")
 }
 func (*UnimplementedFlowsServer) ListFlows(context.Context, *ListFlowsRequest) (*ListFlowsResponse, error) {
diff --git a/dialogflow/cx/apiv3/cxpb/fulfillment.pb.go b/dialogflow/cx/apiv3/cxpb/fulfillment.pb.go
index 7820a37ec5f..f9c7845edc4 100644
--- a/dialogflow/cx/apiv3/cxpb/fulfillment.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/fulfillment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/fulfillment.proto
 
 package cxpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -165,7 +165,7 @@ type Fulfillment_SetParameterAction struct {
 	// Display name of the parameter.
 	Parameter string `protobuf:"bytes,1,opt,name=parameter,proto3" json:"parameter,omitempty"`
 	// The new value of the parameter. A null value clears the parameter.
-	Value *_struct.Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+	Value *structpb.Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
 }
 
 func (x *Fulfillment_SetParameterAction) Reset() {
@@ -207,7 +207,7 @@ func (x *Fulfillment_SetParameterAction) GetParameter() string {
 	return ""
 }
 
-func (x *Fulfillment_SetParameterAction) GetValue() *_struct.Value {
+func (x *Fulfillment_SetParameterAction) GetValue() *structpb.Value {
 	if x != nil {
 		return x.Value
 	}
@@ -532,7 +532,7 @@ var file_google_cloud_dialogflow_cx_v3_fulfillment_proto_goTypes = []interface{}
 	(*Fulfillment_ConditionalCases_Case)(nil),             // 3: google.cloud.dialogflow.cx.v3.Fulfillment.ConditionalCases.Case
 	(*Fulfillment_ConditionalCases_Case_CaseContent)(nil), // 4: google.cloud.dialogflow.cx.v3.Fulfillment.ConditionalCases.Case.CaseContent
 	(*ResponseMessage)(nil),                               // 5: google.cloud.dialogflow.cx.v3.ResponseMessage
-	(*_struct.Value)(nil),                                 // 6: google.protobuf.Value
+	(*structpb.Value)(nil),                                // 6: google.protobuf.Value
 }
 var file_google_cloud_dialogflow_cx_v3_fulfillment_proto_depIdxs = []int32{
 	5, // 0: google.cloud.dialogflow.cx.v3.Fulfillment.messages:type_name -> google.cloud.dialogflow.cx.v3.ResponseMessage
diff --git a/dialogflow/cx/apiv3/cxpb/intent.pb.go b/dialogflow/cx/apiv3/cxpb/intent.pb.go
index 182db63c407..682c5d2dc70 100644
--- a/dialogflow/cx/apiv3/cxpb/intent.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/intent.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/intent.proto
 
 package cxpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -563,7 +563,7 @@ type UpdateIntentRequest struct {
 	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// The mask to control which fields get updated. If the mask is not present,
 	// all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateIntentRequest) Reset() {
@@ -612,7 +612,7 @@ func (x *UpdateIntentRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (x *UpdateIntentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateIntentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1157,8 +1157,8 @@ var file_google_cloud_dialogflow_cx_v3_intent_proto_goTypes = []interface{}{
 	(*Intent_Parameter)(nil),           // 9: google.cloud.dialogflow.cx.v3.Intent.Parameter
 	nil,                                // 10: google.cloud.dialogflow.cx.v3.Intent.LabelsEntry
 	(*Intent_TrainingPhrase_Part)(nil), // 11: google.cloud.dialogflow.cx.v3.Intent.TrainingPhrase.Part
-	(*field_mask.FieldMask)(nil),       // 12: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                // 13: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),      // 12: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),              // 13: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_intent_proto_depIdxs = []int32{
 	8,  // 0: google.cloud.dialogflow.cx.v3.Intent.training_phrases:type_name -> google.cloud.dialogflow.cx.v3.Intent.TrainingPhrase
@@ -1368,7 +1368,7 @@ type IntentsClient interface {
 	// Note: You should always train a flow prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
-	DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type intentsClient struct {
@@ -1415,8 +1415,8 @@ func (c *intentsClient) UpdateIntent(ctx context.Context, in *UpdateIntentReques
 	return out, nil
 }
 
-func (c *intentsClient) DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *intentsClient) DeleteIntent(ctx context.Context, in *DeleteIntentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.Intents/DeleteIntent", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1447,7 +1447,7 @@ type IntentsServer interface {
 	// Note: You should always train a flow prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
-	DeleteIntent(context.Context, *DeleteIntentRequest) (*empty.Empty, error)
+	DeleteIntent(context.Context, *DeleteIntentRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedIntentsServer can be embedded to have forward compatible implementations.
@@ -1466,7 +1466,7 @@ func (*UnimplementedIntentsServer) CreateIntent(context.Context, *CreateIntentRe
 func (*UnimplementedIntentsServer) UpdateIntent(context.Context, *UpdateIntentRequest) (*Intent, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateIntent not implemented")
 }
-func (*UnimplementedIntentsServer) DeleteIntent(context.Context, *DeleteIntentRequest) (*empty.Empty, error) {
+func (*UnimplementedIntentsServer) DeleteIntent(context.Context, *DeleteIntentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteIntent not implemented")
 }
 
diff --git a/dialogflow/cx/apiv3/cxpb/page.pb.go b/dialogflow/cx/apiv3/cxpb/page.pb.go
index e13a1549f10..74a6e8232a4 100644
--- a/dialogflow/cx/apiv3/cxpb/page.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/page.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/page.proto
 
 package cxpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -891,7 +891,7 @@ type UpdatePageRequest struct {
 	LanguageCode string `protobuf:"bytes,2,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 	// The mask to control which fields get updated. If the mask is not present,
 	// all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdatePageRequest) Reset() {
@@ -940,7 +940,7 @@ func (x *UpdatePageRequest) GetLanguageCode() string {
 	return ""
 }
 
-func (x *UpdatePageRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdatePageRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1042,7 +1042,7 @@ type Form_Parameter struct {
 	FillBehavior *Form_Parameter_FillBehavior `protobuf:"bytes,7,opt,name=fill_behavior,json=fillBehavior,proto3" json:"fill_behavior,omitempty"`
 	// The default value of an optional parameter. If the parameter is required,
 	// the default value will be ignored.
-	DefaultValue *_struct.Value `protobuf:"bytes,9,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
+	DefaultValue *structpb.Value `protobuf:"bytes,9,opt,name=default_value,json=defaultValue,proto3" json:"default_value,omitempty"`
 	// Indicates whether the parameter content should be redacted in log.  If
 	// redaction is enabled, the parameter content will be replaced by parameter
 	// name during logging.
@@ -1119,7 +1119,7 @@ func (x *Form_Parameter) GetFillBehavior() *Form_Parameter_FillBehavior {
 	return nil
 }
 
-func (x *Form_Parameter) GetDefaultValue() *_struct.Value {
+func (x *Form_Parameter) GetDefaultValue() *structpb.Value {
 	if x != nil {
 		return x.DefaultValue
 	}
@@ -1535,9 +1535,9 @@ var file_google_cloud_dialogflow_cx_v3_page_proto_goTypes = []interface{}{
 	(*Form_Parameter)(nil),              // 10: google.cloud.dialogflow.cx.v3.Form.Parameter
 	(*Form_Parameter_FillBehavior)(nil), // 11: google.cloud.dialogflow.cx.v3.Form.Parameter.FillBehavior
 	(*Fulfillment)(nil),                 // 12: google.cloud.dialogflow.cx.v3.Fulfillment
-	(*field_mask.FieldMask)(nil),        // 13: google.protobuf.FieldMask
-	(*_struct.Value)(nil),               // 14: google.protobuf.Value
-	(*empty.Empty)(nil),                 // 15: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),       // 13: google.protobuf.FieldMask
+	(*structpb.Value)(nil),              // 14: google.protobuf.Value
+	(*emptypb.Empty)(nil),               // 15: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_page_proto_depIdxs = []int32{
 	12, // 0: google.cloud.dialogflow.cx.v3.Page.entry_fulfillment:type_name -> google.cloud.dialogflow.cx.v3.Fulfillment
@@ -1785,7 +1785,7 @@ type PagesClient interface {
 	// Note: You should always train a flow prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
-	DeletePage(ctx context.Context, in *DeletePageRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeletePage(ctx context.Context, in *DeletePageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type pagesClient struct {
@@ -1832,8 +1832,8 @@ func (c *pagesClient) UpdatePage(ctx context.Context, in *UpdatePageRequest, opt
 	return out, nil
 }
 
-func (c *pagesClient) DeletePage(ctx context.Context, in *DeletePageRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *pagesClient) DeletePage(ctx context.Context, in *DeletePageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.Pages/DeletePage", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1864,7 +1864,7 @@ type PagesServer interface {
 	// Note: You should always train a flow prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
-	DeletePage(context.Context, *DeletePageRequest) (*empty.Empty, error)
+	DeletePage(context.Context, *DeletePageRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedPagesServer can be embedded to have forward compatible implementations.
@@ -1883,7 +1883,7 @@ func (*UnimplementedPagesServer) CreatePage(context.Context, *CreatePageRequest)
 func (*UnimplementedPagesServer) UpdatePage(context.Context, *UpdatePageRequest) (*Page, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdatePage not implemented")
 }
-func (*UnimplementedPagesServer) DeletePage(context.Context, *DeletePageRequest) (*empty.Empty, error) {
+func (*UnimplementedPagesServer) DeletePage(context.Context, *DeletePageRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletePage not implemented")
 }
 
diff --git a/dialogflow/cx/apiv3/cxpb/response_message.pb.go b/dialogflow/cx/apiv3/cxpb/response_message.pb.go
index 4db416bfd7d..0e4b3bd7fde 100644
--- a/dialogflow/cx/apiv3/cxpb/response_message.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/response_message.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/response_message.proto
 
 package cxpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -121,7 +121,7 @@ func (x *ResponseMessage) GetText() *ResponseMessage_Text {
 	return nil
 }
 
-func (x *ResponseMessage) GetPayload() *_struct.Struct {
+func (x *ResponseMessage) GetPayload() *structpb.Struct {
 	if x, ok := x.GetMessage().(*ResponseMessage_Payload); ok {
 		return x.Payload
 	}
@@ -188,7 +188,7 @@ type ResponseMessage_Text_ struct {
 
 type ResponseMessage_Payload struct {
 	// Returns a response containing a custom, platform-specific payload.
-	Payload *_struct.Struct `protobuf:"bytes,2,opt,name=payload,proto3,oneof"`
+	Payload *structpb.Struct `protobuf:"bytes,2,opt,name=payload,proto3,oneof"`
 }
 
 type ResponseMessage_ConversationSuccess_ struct {
@@ -337,7 +337,7 @@ type ResponseMessage_LiveAgentHandoff struct {
 
 	// Custom metadata for your handoff procedure. Dialogflow doesn't impose
 	// any structure on this.
-	Metadata *_struct.Struct `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
+	Metadata *structpb.Struct `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
 }
 
 func (x *ResponseMessage_LiveAgentHandoff) Reset() {
@@ -372,7 +372,7 @@ func (*ResponseMessage_LiveAgentHandoff) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dialogflow_cx_v3_response_message_proto_rawDescGZIP(), []int{0, 1}
 }
 
-func (x *ResponseMessage_LiveAgentHandoff) GetMetadata() *_struct.Struct {
+func (x *ResponseMessage_LiveAgentHandoff) GetMetadata() *structpb.Struct {
 	if x != nil {
 		return x.Metadata
 	}
@@ -399,7 +399,7 @@ type ResponseMessage_ConversationSuccess struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Custom metadata. Dialogflow doesn't impose any structure on this.
-	Metadata *_struct.Struct `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
+	Metadata *structpb.Struct `protobuf:"bytes,1,opt,name=metadata,proto3" json:"metadata,omitempty"`
 }
 
 func (x *ResponseMessage_ConversationSuccess) Reset() {
@@ -434,7 +434,7 @@ func (*ResponseMessage_ConversationSuccess) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dialogflow_cx_v3_response_message_proto_rawDescGZIP(), []int{0, 2}
 }
 
-func (x *ResponseMessage_ConversationSuccess) GetMetadata() *_struct.Struct {
+func (x *ResponseMessage_ConversationSuccess) GetMetadata() *structpb.Struct {
 	if x != nil {
 		return x.Metadata
 	}
@@ -1033,7 +1033,7 @@ var file_google_cloud_dialogflow_cx_v3_response_message_proto_goTypes = []interf
 	(*ResponseMessage_MixedAudio)(nil),            // 7: google.cloud.dialogflow.cx.v3.ResponseMessage.MixedAudio
 	(*ResponseMessage_TelephonyTransferCall)(nil), // 8: google.cloud.dialogflow.cx.v3.ResponseMessage.TelephonyTransferCall
 	(*ResponseMessage_MixedAudio_Segment)(nil),    // 9: google.cloud.dialogflow.cx.v3.ResponseMessage.MixedAudio.Segment
-	(*_struct.Struct)(nil),                        // 10: google.protobuf.Struct
+	(*structpb.Struct)(nil),                       // 10: google.protobuf.Struct
 }
 var file_google_cloud_dialogflow_cx_v3_response_message_proto_depIdxs = []int32{
 	1,  // 0: google.cloud.dialogflow.cx.v3.ResponseMessage.text:type_name -> google.cloud.dialogflow.cx.v3.ResponseMessage.Text
diff --git a/dialogflow/cx/apiv3/cxpb/security_settings.pb.go b/dialogflow/cx/apiv3/cxpb/security_settings.pb.go
index ce2e8018252..f3993429b63 100644
--- a/dialogflow/cx/apiv3/cxpb/security_settings.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/security_settings.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/security_settings.proto
 
 package cxpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -312,7 +312,7 @@ type UpdateSecuritySettingsRequest struct {
 	SecuritySettings *SecuritySettings `protobuf:"bytes,1,opt,name=security_settings,json=securitySettings,proto3" json:"security_settings,omitempty"`
 	// Required. The mask to control which fields get updated. If the mask is not present,
 	// all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSecuritySettingsRequest) Reset() {
@@ -354,7 +354,7 @@ func (x *UpdateSecuritySettingsRequest) GetSecuritySettings() *SecuritySettings
 	return nil
 }
 
-func (x *UpdateSecuritySettingsRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSecuritySettingsRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1282,8 +1282,8 @@ var file_google_cloud_dialogflow_cx_v3_security_settings_proto_goTypes = []inter
 	(*SecuritySettings)(nil),                              // 10: google.cloud.dialogflow.cx.v3.SecuritySettings
 	(*SecuritySettings_AudioExportSettings)(nil),          // 11: google.cloud.dialogflow.cx.v3.SecuritySettings.AudioExportSettings
 	(*SecuritySettings_InsightsExportSettings)(nil),       // 12: google.cloud.dialogflow.cx.v3.SecuritySettings.InsightsExportSettings
-	(*field_mask.FieldMask)(nil),                          // 13: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                                   // 14: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),                         // 13: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                                 // 14: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_security_settings_proto_depIdxs = []int32{
 	10, // 0: google.cloud.dialogflow.cx.v3.UpdateSecuritySettingsRequest.security_settings:type_name -> google.cloud.dialogflow.cx.v3.SecuritySettings
@@ -1474,7 +1474,7 @@ type SecuritySettingsServiceClient interface {
 	// Returns the list of all security settings in the specified location.
 	ListSecuritySettings(ctx context.Context, in *ListSecuritySettingsRequest, opts ...grpc.CallOption) (*ListSecuritySettingsResponse, error)
 	// Deletes the specified [SecuritySettings][google.cloud.dialogflow.cx.v3.SecuritySettings].
-	DeleteSecuritySettings(ctx context.Context, in *DeleteSecuritySettingsRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteSecuritySettings(ctx context.Context, in *DeleteSecuritySettingsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type securitySettingsServiceClient struct {
@@ -1521,8 +1521,8 @@ func (c *securitySettingsServiceClient) ListSecuritySettings(ctx context.Context
 	return out, nil
 }
 
-func (c *securitySettingsServiceClient) DeleteSecuritySettings(ctx context.Context, in *DeleteSecuritySettingsRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *securitySettingsServiceClient) DeleteSecuritySettings(ctx context.Context, in *DeleteSecuritySettingsRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.SecuritySettingsService/DeleteSecuritySettings", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1542,7 +1542,7 @@ type SecuritySettingsServiceServer interface {
 	// Returns the list of all security settings in the specified location.
 	ListSecuritySettings(context.Context, *ListSecuritySettingsRequest) (*ListSecuritySettingsResponse, error)
 	// Deletes the specified [SecuritySettings][google.cloud.dialogflow.cx.v3.SecuritySettings].
-	DeleteSecuritySettings(context.Context, *DeleteSecuritySettingsRequest) (*empty.Empty, error)
+	DeleteSecuritySettings(context.Context, *DeleteSecuritySettingsRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedSecuritySettingsServiceServer can be embedded to have forward compatible implementations.
@@ -1561,7 +1561,7 @@ func (*UnimplementedSecuritySettingsServiceServer) UpdateSecuritySettings(contex
 func (*UnimplementedSecuritySettingsServiceServer) ListSecuritySettings(context.Context, *ListSecuritySettingsRequest) (*ListSecuritySettingsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListSecuritySettings not implemented")
 }
-func (*UnimplementedSecuritySettingsServiceServer) DeleteSecuritySettings(context.Context, *DeleteSecuritySettingsRequest) (*empty.Empty, error) {
+func (*UnimplementedSecuritySettingsServiceServer) DeleteSecuritySettings(context.Context, *DeleteSecuritySettingsRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteSecuritySettings not implemented")
 }
 
diff --git a/dialogflow/cx/apiv3/cxpb/session.pb.go b/dialogflow/cx/apiv3/cxpb/session.pb.go
index 570c44417fc..430651f85ca 100644
--- a/dialogflow/cx/apiv3/cxpb/session.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/session.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/session.proto
 
 package cxpb
@@ -25,8 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	_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"
@@ -35,6 +33,8 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -741,7 +741,7 @@ type StreamingRecognitionResult struct {
 	// Time offset of the end of this Speech recognition result relative to the
 	// beginning of the audio. Only populated for `message_type` =
 	// `TRANSCRIPT`.
-	SpeechEndOffset *duration.Duration `protobuf:"bytes,8,opt,name=speech_end_offset,json=speechEndOffset,proto3" json:"speech_end_offset,omitempty"`
+	SpeechEndOffset *durationpb.Duration `protobuf:"bytes,8,opt,name=speech_end_offset,json=speechEndOffset,proto3" json:"speech_end_offset,omitempty"`
 	// Detected language code for the transcript.
 	LanguageCode string `protobuf:"bytes,10,opt,name=language_code,json=languageCode,proto3" json:"language_code,omitempty"`
 }
@@ -820,7 +820,7 @@ func (x *StreamingRecognitionResult) GetSpeechWordInfo() []*SpeechWordInfo {
 	return nil
 }
 
-func (x *StreamingRecognitionResult) GetSpeechEndOffset() *duration.Duration {
+func (x *StreamingRecognitionResult) GetSpeechEndOffset() *durationpb.Duration {
 	if x != nil {
 		return x.SpeechEndOffset
 	}
@@ -866,7 +866,7 @@ type QueryParameters struct {
 	//	}
 	//
 	// ```
-	Payload *_struct.Struct `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
+	Payload *structpb.Struct `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
 	// Additional parameters to be put into [session
 	// parameters][SessionInfo.parameters]. To remove a
 	// parameter from the session, clients should explicitly set the parameter
@@ -887,7 +887,7 @@ type QueryParameters struct {
 	// * MapValue value: If parameter's entity type is a composite entity then use
 	// map from composite entity property names to property values, otherwise,
 	// use parameter value.
-	Parameters *_struct.Struct `protobuf:"bytes,5,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	Parameters *structpb.Struct `protobuf:"bytes,5,opt,name=parameters,proto3" json:"parameters,omitempty"`
 	// The unique identifier of the [page][google.cloud.dialogflow.cx.v3.Page] to override the [current
 	// page][QueryResult.current_page] in the session.
 	// Format: `projects/<Project ID>/locations/<Location ID>/agents/<Agent
@@ -979,14 +979,14 @@ func (x *QueryParameters) GetSessionEntityTypes() []*SessionEntityType {
 	return nil
 }
 
-func (x *QueryParameters) GetPayload() *_struct.Struct {
+func (x *QueryParameters) GetPayload() *structpb.Struct {
 	if x != nil {
 		return x.Payload
 	}
 	return nil
 }
 
-func (x *QueryParameters) GetParameters() *_struct.Struct {
+func (x *QueryParameters) GetParameters() *structpb.Struct {
 	if x != nil {
 		return x.Parameters
 	}
@@ -1214,7 +1214,7 @@ type QueryResult struct {
 	// * MapValue value: If parameter's entity type is a composite entity then use
 	// map from composite entity property names to property values, otherwise,
 	// use parameter value.
-	Parameters *_struct.Struct `protobuf:"bytes,3,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	Parameters *structpb.Struct `protobuf:"bytes,3,opt,name=parameters,proto3" json:"parameters,omitempty"`
 	// The list of rich messages returned to the client. Responses vary from
 	// simple text messages to more sophisticated, structured payloads used
 	// to drive complex logic.
@@ -1224,7 +1224,7 @@ type QueryResult struct {
 	// The list of webhook payload in [WebhookResponse.payload][google.cloud.dialogflow.cx.v3.WebhookResponse.payload], in
 	// the order of call sequence. If some webhook call fails or doesn't return
 	// any payload, an empty `Struct` would be used instead.
-	WebhookPayloads []*_struct.Struct `protobuf:"bytes,6,rep,name=webhook_payloads,json=webhookPayloads,proto3" json:"webhook_payloads,omitempty"`
+	WebhookPayloads []*structpb.Struct `protobuf:"bytes,6,rep,name=webhook_payloads,json=webhookPayloads,proto3" json:"webhook_payloads,omitempty"`
 	// The current [Page][google.cloud.dialogflow.cx.v3.Page]. Some, not all fields are filled in this message,
 	// including but not limited to `name` and `display_name`.
 	CurrentPage *Page `protobuf:"bytes,7,opt,name=current_page,json=currentPage,proto3" json:"current_page,omitempty"`
@@ -1264,7 +1264,7 @@ type QueryResult struct {
 	//     are included.
 	//   - Other intents referenced by intent routes in scope that matched end-user
 	//     input, but had a lower confidence score.
-	DiagnosticInfo *_struct.Struct `protobuf:"bytes,10,opt,name=diagnostic_info,json=diagnosticInfo,proto3" json:"diagnostic_info,omitempty"`
+	DiagnosticInfo *structpb.Struct `protobuf:"bytes,10,opt,name=diagnostic_info,json=diagnosticInfo,proto3" json:"diagnostic_info,omitempty"`
 	// The sentiment analyss result, which depends on
 	// [`analyze_query_text_sentiment`]
 	// [google.cloud.dialogflow.cx.v3.QueryParameters.analyze_query_text_sentiment], specified in the request.
@@ -1352,7 +1352,7 @@ func (x *QueryResult) GetLanguageCode() string {
 	return ""
 }
 
-func (x *QueryResult) GetParameters() *_struct.Struct {
+func (x *QueryResult) GetParameters() *structpb.Struct {
 	if x != nil {
 		return x.Parameters
 	}
@@ -1373,7 +1373,7 @@ func (x *QueryResult) GetWebhookStatuses() []*status.Status {
 	return nil
 }
 
-func (x *QueryResult) GetWebhookPayloads() []*_struct.Struct {
+func (x *QueryResult) GetWebhookPayloads() []*structpb.Struct {
 	if x != nil {
 		return x.WebhookPayloads
 	}
@@ -1410,7 +1410,7 @@ func (x *QueryResult) GetMatch() *Match {
 	return nil
 }
 
-func (x *QueryResult) GetDiagnosticInfo() *_struct.Struct {
+func (x *QueryResult) GetDiagnosticInfo() *structpb.Struct {
 	if x != nil {
 		return x.DiagnosticInfo
 	}
@@ -1773,7 +1773,7 @@ type Match struct {
 	// * MapValue value: If parameter's entity type is a composite entity then use
 	// map from composite entity property names to property values, otherwise,
 	// use parameter value.
-	Parameters *_struct.Struct `protobuf:"bytes,2,opt,name=parameters,proto3" json:"parameters,omitempty"`
+	Parameters *structpb.Struct `protobuf:"bytes,2,opt,name=parameters,proto3" json:"parameters,omitempty"`
 	// Final text input which was matched during MatchIntent. This value can be
 	// different from original input sent in request because of spelling
 	// correction or other processing.
@@ -1835,7 +1835,7 @@ func (x *Match) GetEvent() string {
 	return ""
 }
 
-func (x *Match) GetParameters() *_struct.Struct {
+func (x *Match) GetParameters() *structpb.Struct {
 	if x != nil {
 		return x.Parameters
 	}
@@ -2874,10 +2874,10 @@ var file_google_cloud_dialogflow_cx_v3_session_proto_goTypes = []interface{}{
 	nil,                                         // 22: google.cloud.dialogflow.cx.v3.QueryParameters.WebhookHeadersEntry
 	(*OutputAudioConfig)(nil),                   // 23: google.cloud.dialogflow.cx.v3.OutputAudioConfig
 	(*SpeechWordInfo)(nil),                      // 24: google.cloud.dialogflow.cx.v3.SpeechWordInfo
-	(*duration.Duration)(nil),                   // 25: google.protobuf.Duration
+	(*durationpb.Duration)(nil),                 // 25: google.protobuf.Duration
 	(*latlng.LatLng)(nil),                       // 26: google.type.LatLng
 	(*SessionEntityType)(nil),                   // 27: google.cloud.dialogflow.cx.v3.SessionEntityType
-	(*_struct.Struct)(nil),                      // 28: google.protobuf.Struct
+	(*structpb.Struct)(nil),                     // 28: google.protobuf.Struct
 	(*ResponseMessage)(nil),                     // 29: google.cloud.dialogflow.cx.v3.ResponseMessage
 	(*status.Status)(nil),                       // 30: google.rpc.Status
 	(*Page)(nil),                                // 31: google.cloud.dialogflow.cx.v3.Page
diff --git a/dialogflow/cx/apiv3/cxpb/session_entity_type.pb.go b/dialogflow/cx/apiv3/cxpb/session_entity_type.pb.go
index f3c856f8bab..10c63ff47a0 100644
--- a/dialogflow/cx/apiv3/cxpb/session_entity_type.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/session_entity_type.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/session_entity_type.proto
 
 package cxpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -457,7 +457,7 @@ type UpdateSessionEntityTypeRequest struct {
 	// environment.
 	SessionEntityType *SessionEntityType `protobuf:"bytes,1,opt,name=session_entity_type,json=sessionEntityType,proto3" json:"session_entity_type,omitempty"`
 	// The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSessionEntityTypeRequest) Reset() {
@@ -499,7 +499,7 @@ func (x *UpdateSessionEntityTypeRequest) GetSessionEntityType() *SessionEntityTy
 	return nil
 }
 
-func (x *UpdateSessionEntityTypeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSessionEntityTypeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -842,8 +842,8 @@ var file_google_cloud_dialogflow_cx_v3_session_entity_type_proto_goTypes = []int
 	(*UpdateSessionEntityTypeRequest)(nil),    // 6: google.cloud.dialogflow.cx.v3.UpdateSessionEntityTypeRequest
 	(*DeleteSessionEntityTypeRequest)(nil),    // 7: google.cloud.dialogflow.cx.v3.DeleteSessionEntityTypeRequest
 	(*EntityType_Entity)(nil),                 // 8: google.cloud.dialogflow.cx.v3.EntityType.Entity
-	(*field_mask.FieldMask)(nil),              // 9: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                       // 10: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),             // 9: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                     // 10: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_session_entity_type_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.dialogflow.cx.v3.SessionEntityType.entity_override_mode:type_name -> google.cloud.dialogflow.cx.v3.SessionEntityType.EntityOverrideMode
@@ -1003,7 +1003,7 @@ type SessionEntityTypesClient interface {
 	// Updates the specified session entity type.
 	UpdateSessionEntityType(ctx context.Context, in *UpdateSessionEntityTypeRequest, opts ...grpc.CallOption) (*SessionEntityType, error)
 	// Deletes the specified session entity type.
-	DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type sessionEntityTypesClient struct {
@@ -1050,8 +1050,8 @@ func (c *sessionEntityTypesClient) UpdateSessionEntityType(ctx context.Context,
 	return out, nil
 }
 
-func (c *sessionEntityTypesClient) DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *sessionEntityTypesClient) DeleteSessionEntityType(ctx context.Context, in *DeleteSessionEntityTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.SessionEntityTypes/DeleteSessionEntityType", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1070,7 +1070,7 @@ type SessionEntityTypesServer interface {
 	// Updates the specified session entity type.
 	UpdateSessionEntityType(context.Context, *UpdateSessionEntityTypeRequest) (*SessionEntityType, error)
 	// Deletes the specified session entity type.
-	DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*empty.Empty, error)
+	DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedSessionEntityTypesServer can be embedded to have forward compatible implementations.
@@ -1089,7 +1089,7 @@ func (*UnimplementedSessionEntityTypesServer) CreateSessionEntityType(context.Co
 func (*UnimplementedSessionEntityTypesServer) UpdateSessionEntityType(context.Context, *UpdateSessionEntityTypeRequest) (*SessionEntityType, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateSessionEntityType not implemented")
 }
-func (*UnimplementedSessionEntityTypesServer) DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*empty.Empty, error) {
+func (*UnimplementedSessionEntityTypesServer) DeleteSessionEntityType(context.Context, *DeleteSessionEntityTypeRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteSessionEntityType not implemented")
 }
 
diff --git a/dialogflow/cx/apiv3/cxpb/test_case.pb.go b/dialogflow/cx/apiv3/cxpb/test_case.pb.go
index ffb066b038d..b7e28961f2a 100644
--- a/dialogflow/cx/apiv3/cxpb/test_case.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/test_case.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/test_case.proto
 
 package cxpb
@@ -25,18 +25,18 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	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"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -352,7 +352,7 @@ type TestCase struct {
 	// that should occur when the agent is working properly.
 	TestCaseConversationTurns []*ConversationTurn `protobuf:"bytes,5,rep,name=test_case_conversation_turns,json=testCaseConversationTurns,proto3" json:"test_case_conversation_turns,omitempty"`
 	// Output only. When the test was created.
-	CreationTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"`
+	CreationTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"`
 	// The latest test result.
 	LastTestResult *TestCaseResult `protobuf:"bytes,12,opt,name=last_test_result,json=lastTestResult,proto3" json:"last_test_result,omitempty"`
 }
@@ -431,7 +431,7 @@ func (x *TestCase) GetTestCaseConversationTurns() []*ConversationTurn {
 	return nil
 }
 
-func (x *TestCase) GetCreationTime() *timestamp.Timestamp {
+func (x *TestCase) GetCreationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreationTime
 	}
@@ -464,7 +464,7 @@ type TestCaseResult struct {
 	// Whether the test case passed in the agent environment.
 	TestResult TestResult `protobuf:"varint,4,opt,name=test_result,json=testResult,proto3,enum=google.cloud.dialogflow.cx.v3.TestResult" json:"test_result,omitempty"`
 	// The time that the test was run.
-	TestTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=test_time,json=testTime,proto3" json:"test_time,omitempty"`
+	TestTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=test_time,json=testTime,proto3" json:"test_time,omitempty"`
 }
 
 func (x *TestCaseResult) Reset() {
@@ -527,7 +527,7 @@ func (x *TestCaseResult) GetTestResult() TestResult {
 	return TestResult_TEST_RESULT_UNSPECIFIED
 }
 
-func (x *TestCaseResult) GetTestTime() *timestamp.Timestamp {
+func (x *TestCaseResult) GetTestTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.TestTime
 	}
@@ -1351,7 +1351,7 @@ type UpdateTestCaseRequest struct {
 	// Required. The mask to specify which fields should be updated. The
 	// [`creationTime`][google.cloud.dialogflow.cx.v3.TestCase.creation_time] and
 	// [`lastTestResult`][google.cloud.dialogflow.cx.v3.TestCase.last_test_result] cannot be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateTestCaseRequest) Reset() {
@@ -1393,7 +1393,7 @@ func (x *UpdateTestCaseRequest) GetTestCase() *TestCase {
 	return nil
 }
 
-func (x *UpdateTestCaseRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTestCaseRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1784,7 +1784,7 @@ type TestError struct {
 	// The status associated with the test.
 	Status *status.Status `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"`
 	// The timestamp when the test was completed.
-	TestTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=test_time,json=testTime,proto3" json:"test_time,omitempty"`
+	TestTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=test_time,json=testTime,proto3" json:"test_time,omitempty"`
 }
 
 func (x *TestError) Reset() {
@@ -1833,7 +1833,7 @@ func (x *TestError) GetStatus() *status.Status {
 	return nil
 }
 
-func (x *TestError) GetTestTime() *timestamp.Timestamp {
+func (x *TestError) GetTestTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.TestTime
 	}
@@ -2574,7 +2574,7 @@ type ConversationTurn_UserInput struct {
 	Input *QueryInput `protobuf:"bytes,5,opt,name=input,proto3" json:"input,omitempty"`
 	// Parameters that need to be injected into the conversation during intent
 	// detection.
-	InjectedParameters *_struct.Struct `protobuf:"bytes,2,opt,name=injected_parameters,json=injectedParameters,proto3" json:"injected_parameters,omitempty"`
+	InjectedParameters *structpb.Struct `protobuf:"bytes,2,opt,name=injected_parameters,json=injectedParameters,proto3" json:"injected_parameters,omitempty"`
 	// If webhooks should be allowed to trigger in response to the user
 	// utterance. Often if parameters are injected, webhooks should not be
 	// enabled.
@@ -2622,7 +2622,7 @@ func (x *ConversationTurn_UserInput) GetInput() *QueryInput {
 	return nil
 }
 
-func (x *ConversationTurn_UserInput) GetInjectedParameters() *_struct.Struct {
+func (x *ConversationTurn_UserInput) GetInjectedParameters() *structpb.Struct {
 	if x != nil {
 		return x.InjectedParameters
 	}
@@ -2650,7 +2650,7 @@ type ConversationTurn_VirtualAgentOutput struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The session parameters available to the bot at this point.
-	SessionParameters *_struct.Struct `protobuf:"bytes,4,opt,name=session_parameters,json=sessionParameters,proto3" json:"session_parameters,omitempty"`
+	SessionParameters *structpb.Struct `protobuf:"bytes,4,opt,name=session_parameters,json=sessionParameters,proto3" json:"session_parameters,omitempty"`
 	// Output only. If this is part of a [result conversation
 	// turn][TestCaseResult.conversation_turns], the list of differences
 	// between the original run and the replay for this output, if any.
@@ -2658,7 +2658,7 @@ type ConversationTurn_VirtualAgentOutput struct {
 	// Required. Input only. The diagnostic
 	// [info][Session.DetectIntentResponse.QueryResult.diagnostic_info]
 	// output for the turn. Required to calculate the testing coverage.
-	DiagnosticInfo *_struct.Struct `protobuf:"bytes,6,opt,name=diagnostic_info,json=diagnosticInfo,proto3" json:"diagnostic_info,omitempty"`
+	DiagnosticInfo *structpb.Struct `protobuf:"bytes,6,opt,name=diagnostic_info,json=diagnosticInfo,proto3" json:"diagnostic_info,omitempty"`
 	// The [Intent][google.cloud.dialogflow.cx.v3.Intent] that triggered the response. Only name and displayName
 	// will be set.
 	TriggeredIntent *Intent `protobuf:"bytes,7,opt,name=triggered_intent,json=triggeredIntent,proto3" json:"triggered_intent,omitempty"`
@@ -2704,7 +2704,7 @@ func (*ConversationTurn_VirtualAgentOutput) Descriptor() ([]byte, []int) {
 	return file_google_cloud_dialogflow_cx_v3_test_case_proto_rawDescGZIP(), []int{3, 1}
 }
 
-func (x *ConversationTurn_VirtualAgentOutput) GetSessionParameters() *_struct.Struct {
+func (x *ConversationTurn_VirtualAgentOutput) GetSessionParameters() *structpb.Struct {
 	if x != nil {
 		return x.SessionParameters
 	}
@@ -2718,7 +2718,7 @@ func (x *ConversationTurn_VirtualAgentOutput) GetDifferences() []*TestRunDiffere
 	return nil
 }
 
-func (x *ConversationTurn_VirtualAgentOutput) GetDiagnosticInfo() *_struct.Struct {
+func (x *ConversationTurn_VirtualAgentOutput) GetDiagnosticInfo() *structpb.Struct {
 	if x != nil {
 		return x.DiagnosticInfo
 	}
@@ -3949,11 +3949,11 @@ var file_google_cloud_dialogflow_cx_v3_test_case_proto_goTypes = []interface{}{
 	(*TransitionRouteGroupCoverage_Coverage)(nil),            // 42: google.cloud.dialogflow.cx.v3.TransitionRouteGroupCoverage.Coverage
 	(*TransitionRouteGroupCoverage_Coverage_Transition)(nil), // 43: google.cloud.dialogflow.cx.v3.TransitionRouteGroupCoverage.Coverage.Transition
 	(*IntentCoverage_Intent)(nil),                            // 44: google.cloud.dialogflow.cx.v3.IntentCoverage.Intent
-	(*timestamp.Timestamp)(nil),                              // 45: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                             // 46: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                            // 45: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                            // 46: google.protobuf.FieldMask
 	(*status.Status)(nil),                                    // 47: google.rpc.Status
 	(*QueryInput)(nil),                                       // 48: google.cloud.dialogflow.cx.v3.QueryInput
-	(*_struct.Struct)(nil),                                   // 49: google.protobuf.Struct
+	(*structpb.Struct)(nil),                                  // 49: google.protobuf.Struct
 	(*Intent)(nil),                                           // 50: google.cloud.dialogflow.cx.v3.Intent
 	(*Page)(nil),                                             // 51: google.cloud.dialogflow.cx.v3.Page
 	(*ResponseMessage_Text)(nil),                             // 52: google.cloud.dialogflow.cx.v3.ResponseMessage.Text
@@ -3961,7 +3961,7 @@ var file_google_cloud_dialogflow_cx_v3_test_case_proto_goTypes = []interface{}{
 	(*TransitionRoute)(nil),                                  // 54: google.cloud.dialogflow.cx.v3.TransitionRoute
 	(*EventHandler)(nil),                                     // 55: google.cloud.dialogflow.cx.v3.EventHandler
 	(*TransitionRouteGroup)(nil),                             // 56: google.cloud.dialogflow.cx.v3.TransitionRouteGroup
-	(*empty.Empty)(nil),                                      // 57: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                    // 57: google.protobuf.Empty
 	(*longrunning.Operation)(nil),                            // 58: google.longrunning.Operation
 }
 var file_google_cloud_dialogflow_cx_v3_test_case_proto_depIdxs = []int32{
@@ -4599,7 +4599,7 @@ type TestCasesClient interface {
 	// Fetches a list of test cases for a given agent.
 	ListTestCases(ctx context.Context, in *ListTestCasesRequest, opts ...grpc.CallOption) (*ListTestCasesResponse, error)
 	// Batch deletes test cases.
-	BatchDeleteTestCases(ctx context.Context, in *BatchDeleteTestCasesRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	BatchDeleteTestCases(ctx context.Context, in *BatchDeleteTestCasesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets a test case.
 	GetTestCase(ctx context.Context, in *GetTestCaseRequest, opts ...grpc.CallOption) (*TestCase, error)
 	// Creates a test case for the given agent.
@@ -4670,8 +4670,8 @@ func (c *testCasesClient) ListTestCases(ctx context.Context, in *ListTestCasesRe
 	return out, nil
 }
 
-func (c *testCasesClient) BatchDeleteTestCases(ctx context.Context, in *BatchDeleteTestCasesRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *testCasesClient) BatchDeleteTestCases(ctx context.Context, in *BatchDeleteTestCasesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.TestCases/BatchDeleteTestCases", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -4774,7 +4774,7 @@ type TestCasesServer interface {
 	// Fetches a list of test cases for a given agent.
 	ListTestCases(context.Context, *ListTestCasesRequest) (*ListTestCasesResponse, error)
 	// Batch deletes test cases.
-	BatchDeleteTestCases(context.Context, *BatchDeleteTestCasesRequest) (*empty.Empty, error)
+	BatchDeleteTestCases(context.Context, *BatchDeleteTestCasesRequest) (*emptypb.Empty, error)
 	// Gets a test case.
 	GetTestCase(context.Context, *GetTestCaseRequest) (*TestCase, error)
 	// Creates a test case for the given agent.
@@ -4835,7 +4835,7 @@ type UnimplementedTestCasesServer struct {
 func (*UnimplementedTestCasesServer) ListTestCases(context.Context, *ListTestCasesRequest) (*ListTestCasesResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListTestCases not implemented")
 }
-func (*UnimplementedTestCasesServer) BatchDeleteTestCases(context.Context, *BatchDeleteTestCasesRequest) (*empty.Empty, error) {
+func (*UnimplementedTestCasesServer) BatchDeleteTestCases(context.Context, *BatchDeleteTestCasesRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method BatchDeleteTestCases not implemented")
 }
 func (*UnimplementedTestCasesServer) GetTestCase(context.Context, *GetTestCaseRequest) (*TestCase, error) {
diff --git a/dialogflow/cx/apiv3/cxpb/transition_route_group.pb.go b/dialogflow/cx/apiv3/cxpb/transition_route_group.pb.go
index fd1c48bd32d..75ff8ba9e9e 100644
--- a/dialogflow/cx/apiv3/cxpb/transition_route_group.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/transition_route_group.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/transition_route_group.proto
 
 package cxpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -426,7 +426,7 @@ type UpdateTransitionRouteGroupRequest struct {
 	// Required. The transition route group to update.
 	TransitionRouteGroup *TransitionRouteGroup `protobuf:"bytes,1,opt,name=transition_route_group,json=transitionRouteGroup,proto3" json:"transition_route_group,omitempty"`
 	// The mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// The language of the following fields in `TransitionRouteGroup`:
 	//
 	// *  `TransitionRouteGroup.transition_routes.trigger_fulfillment.messages`
@@ -480,7 +480,7 @@ func (x *UpdateTransitionRouteGroupRequest) GetTransitionRouteGroup() *Transitio
 	return nil
 }
 
-func (x *UpdateTransitionRouteGroupRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTransitionRouteGroupRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -808,8 +808,8 @@ var file_google_cloud_dialogflow_cx_v3_transition_route_group_proto_goTypes = []
 	(*UpdateTransitionRouteGroupRequest)(nil), // 5: google.cloud.dialogflow.cx.v3.UpdateTransitionRouteGroupRequest
 	(*DeleteTransitionRouteGroupRequest)(nil), // 6: google.cloud.dialogflow.cx.v3.DeleteTransitionRouteGroupRequest
 	(*TransitionRoute)(nil),                   // 7: google.cloud.dialogflow.cx.v3.TransitionRoute
-	(*field_mask.FieldMask)(nil),              // 8: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                       // 9: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),             // 8: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                     // 9: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_transition_route_group_proto_depIdxs = []int32{
 	7,  // 0: google.cloud.dialogflow.cx.v3.TransitionRouteGroup.transition_routes:type_name -> google.cloud.dialogflow.cx.v3.TransitionRoute
@@ -979,7 +979,7 @@ type TransitionRouteGroupsClient interface {
 	// Note: You should always train a flow prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
-	DeleteTransitionRouteGroup(ctx context.Context, in *DeleteTransitionRouteGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTransitionRouteGroup(ctx context.Context, in *DeleteTransitionRouteGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type transitionRouteGroupsClient struct {
@@ -1026,8 +1026,8 @@ func (c *transitionRouteGroupsClient) UpdateTransitionRouteGroup(ctx context.Con
 	return out, nil
 }
 
-func (c *transitionRouteGroupsClient) DeleteTransitionRouteGroup(ctx context.Context, in *DeleteTransitionRouteGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *transitionRouteGroupsClient) DeleteTransitionRouteGroup(ctx context.Context, in *DeleteTransitionRouteGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.TransitionRouteGroups/DeleteTransitionRouteGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1058,7 +1058,7 @@ type TransitionRouteGroupsServer interface {
 	// Note: You should always train a flow prior to sending it queries. See the
 	// [training
 	// documentation](https://cloud.google.com/dialogflow/cx/docs/concept/training).
-	DeleteTransitionRouteGroup(context.Context, *DeleteTransitionRouteGroupRequest) (*empty.Empty, error)
+	DeleteTransitionRouteGroup(context.Context, *DeleteTransitionRouteGroupRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedTransitionRouteGroupsServer can be embedded to have forward compatible implementations.
@@ -1077,7 +1077,7 @@ func (*UnimplementedTransitionRouteGroupsServer) CreateTransitionRouteGroup(cont
 func (*UnimplementedTransitionRouteGroupsServer) UpdateTransitionRouteGroup(context.Context, *UpdateTransitionRouteGroupRequest) (*TransitionRouteGroup, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateTransitionRouteGroup not implemented")
 }
-func (*UnimplementedTransitionRouteGroupsServer) DeleteTransitionRouteGroup(context.Context, *DeleteTransitionRouteGroupRequest) (*empty.Empty, error) {
+func (*UnimplementedTransitionRouteGroupsServer) DeleteTransitionRouteGroup(context.Context, *DeleteTransitionRouteGroupRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTransitionRouteGroup not implemented")
 }
 
diff --git a/dialogflow/cx/apiv3/cxpb/validation_message.pb.go b/dialogflow/cx/apiv3/cxpb/validation_message.pb.go
index 0012c44134e..96c7caf2abe 100644
--- a/dialogflow/cx/apiv3/cxpb/validation_message.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/validation_message.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/validation_message.proto
 
 package cxpb
diff --git a/dialogflow/cx/apiv3/cxpb/version.pb.go b/dialogflow/cx/apiv3/cxpb/version.pb.go
index a700e303034..0b307d2a66e 100644
--- a/dialogflow/cx/apiv3/cxpb/version.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/version.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/version.proto
 
 package cxpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -171,7 +171,7 @@ type Version struct {
 	// Output only. The NLU settings of the flow at version creation.
 	NluSettings *NluSettings `protobuf:"bytes,4,opt,name=nlu_settings,json=nluSettings,proto3" json:"nlu_settings,omitempty"`
 	// Output only. Create time of the version.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The state of this version. This field is read-only and cannot be set by
 	// create and update methods.
 	State Version_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.cloud.dialogflow.cx.v3.Version_State" json:"state,omitempty"`
@@ -237,7 +237,7 @@ func (x *Version) GetNluSettings() *NluSettings {
 	return nil
 }
 
-func (x *Version) GetCreateTime() *timestamp.Timestamp {
+func (x *Version) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -503,7 +503,7 @@ type UpdateVersionRequest struct {
 	Version *Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
 	// Required. The mask to control which fields get updated. Currently only `description`
 	// and `display_name` can be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateVersionRequest) Reset() {
@@ -545,7 +545,7 @@ func (x *UpdateVersionRequest) GetVersion() *Version {
 	return nil
 }
 
-func (x *UpdateVersionRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateVersionRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -757,7 +757,7 @@ type CompareVersionsResponse struct {
 	// JSON representation of the target version content.
 	TargetVersionContentJson string `protobuf:"bytes,2,opt,name=target_version_content_json,json=targetVersionContentJson,proto3" json:"target_version_content_json,omitempty"`
 	// The timestamp when the two version compares.
-	CompareTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=compare_time,json=compareTime,proto3" json:"compare_time,omitempty"`
+	CompareTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=compare_time,json=compareTime,proto3" json:"compare_time,omitempty"`
 }
 
 func (x *CompareVersionsResponse) Reset() {
@@ -806,7 +806,7 @@ func (x *CompareVersionsResponse) GetTargetVersionContentJson() string {
 	return ""
 }
 
-func (x *CompareVersionsResponse) GetCompareTime() *timestamp.Timestamp {
+func (x *CompareVersionsResponse) GetCompareTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompareTime
 	}
@@ -1109,10 +1109,10 @@ var file_google_cloud_dialogflow_cx_v3_version_proto_goTypes = []interface{}{
 	(*CompareVersionsRequest)(nil),         // 10: google.cloud.dialogflow.cx.v3.CompareVersionsRequest
 	(*CompareVersionsResponse)(nil),        // 11: google.cloud.dialogflow.cx.v3.CompareVersionsResponse
 	(*NluSettings)(nil),                    // 12: google.cloud.dialogflow.cx.v3.NluSettings
-	(*timestamp.Timestamp)(nil),            // 13: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),           // 14: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),          // 13: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),          // 14: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),          // 15: google.longrunning.Operation
-	(*empty.Empty)(nil),                    // 16: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                  // 16: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_version_proto_depIdxs = []int32{
 	12, // 0: google.cloud.dialogflow.cx.v3.Version.nlu_settings:type_name -> google.cloud.dialogflow.cx.v3.NluSettings
@@ -1333,7 +1333,7 @@ type VersionsClient interface {
 	// Updates the specified [Version][google.cloud.dialogflow.cx.v3.Version].
 	UpdateVersion(ctx context.Context, in *UpdateVersionRequest, opts ...grpc.CallOption) (*Version, error)
 	// Deletes the specified [Version][google.cloud.dialogflow.cx.v3.Version].
-	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Loads resources in the specified version to the draft flow.
 	//
 	// This method is a [long-running
@@ -1393,8 +1393,8 @@ func (c *versionsClient) UpdateVersion(ctx context.Context, in *UpdateVersionReq
 	return out, nil
 }
 
-func (c *versionsClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *versionsClient) DeleteVersion(ctx context.Context, in *DeleteVersionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.Versions/DeleteVersion", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1438,7 +1438,7 @@ type VersionsServer interface {
 	// Updates the specified [Version][google.cloud.dialogflow.cx.v3.Version].
 	UpdateVersion(context.Context, *UpdateVersionRequest) (*Version, error)
 	// Deletes the specified [Version][google.cloud.dialogflow.cx.v3.Version].
-	DeleteVersion(context.Context, *DeleteVersionRequest) (*empty.Empty, error)
+	DeleteVersion(context.Context, *DeleteVersionRequest) (*emptypb.Empty, error)
 	// Loads resources in the specified version to the draft flow.
 	//
 	// This method is a [long-running
@@ -1470,7 +1470,7 @@ func (*UnimplementedVersionsServer) CreateVersion(context.Context, *CreateVersio
 func (*UnimplementedVersionsServer) UpdateVersion(context.Context, *UpdateVersionRequest) (*Version, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateVersion not implemented")
 }
-func (*UnimplementedVersionsServer) DeleteVersion(context.Context, *DeleteVersionRequest) (*empty.Empty, error) {
+func (*UnimplementedVersionsServer) DeleteVersion(context.Context, *DeleteVersionRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteVersion not implemented")
 }
 func (*UnimplementedVersionsServer) LoadVersion(context.Context, *LoadVersionRequest) (*longrunning.Operation, error) {
diff --git a/dialogflow/cx/apiv3/cxpb/webhook.pb.go b/dialogflow/cx/apiv3/cxpb/webhook.pb.go
index 66f0f242c5e..63519448337 100644
--- a/dialogflow/cx/apiv3/cxpb/webhook.pb.go
+++ b/dialogflow/cx/apiv3/cxpb/webhook.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/dialogflow/cx/v3/webhook.proto
 
 package cxpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -185,7 +185,7 @@ type Webhook struct {
 	// Webhook execution timeout. Execution is considered failed if Dialogflow
 	// doesn't receive a response from webhook at the end of the timeout period.
 	// Defaults to 5 seconds, maximum allowed timeout is 30 seconds.
-	Timeout *duration.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,6,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Indicates whether the webhook is disabled.
 	Disabled bool `protobuf:"varint,5,opt,name=disabled,proto3" json:"disabled,omitempty"`
 }
@@ -257,7 +257,7 @@ func (x *Webhook) GetServiceDirectory() *Webhook_ServiceDirectoryConfig {
 	return nil
 }
 
-func (x *Webhook) GetTimeout() *duration.Duration {
+func (x *Webhook) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -539,7 +539,7 @@ type UpdateWebhookRequest struct {
 	Webhook *Webhook `protobuf:"bytes,1,opt,name=webhook,proto3" json:"webhook,omitempty"`
 	// The mask to control which fields get updated. If the mask is not present,
 	// all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateWebhookRequest) Reset() {
@@ -581,7 +581,7 @@ func (x *UpdateWebhookRequest) GetWebhook() *Webhook {
 	return nil
 }
 
-func (x *UpdateWebhookRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateWebhookRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -695,7 +695,7 @@ type WebhookRequest struct {
 	// [WebhookResponse.fulfillment_response][google.cloud.dialogflow.cx.v3.WebhookResponse.fulfillment_response];
 	Messages []*ResponseMessage `protobuf:"bytes,7,rep,name=messages,proto3" json:"messages,omitempty"`
 	// Custom data set in [QueryParameters.payload][google.cloud.dialogflow.cx.v3.QueryParameters.payload].
-	Payload *_struct.Struct `protobuf:"bytes,8,opt,name=payload,proto3" json:"payload,omitempty"`
+	Payload *structpb.Struct `protobuf:"bytes,8,opt,name=payload,proto3" json:"payload,omitempty"`
 	// The sentiment analysis result of the current user request. The field is
 	// filled when sentiment analysis is configured to be enabled for the request.
 	SentimentAnalysisResult *WebhookRequest_SentimentAnalysisResult `protobuf:"bytes,9,opt,name=sentiment_analysis_result,json=sentimentAnalysisResult,proto3" json:"sentiment_analysis_result,omitempty"`
@@ -817,7 +817,7 @@ func (x *WebhookRequest) GetMessages() []*ResponseMessage {
 	return nil
 }
 
-func (x *WebhookRequest) GetPayload() *_struct.Struct {
+func (x *WebhookRequest) GetPayload() *structpb.Struct {
 	if x != nil {
 		return x.Payload
 	}
@@ -885,7 +885,7 @@ type WebhookResponse struct {
 	// if it does not intend to modify session status.
 	SessionInfo *SessionInfo `protobuf:"bytes,3,opt,name=session_info,json=sessionInfo,proto3" json:"session_info,omitempty"`
 	// Value to append directly to [QueryResult.webhook_payloads][google.cloud.dialogflow.cx.v3.QueryResult.webhook_payloads].
-	Payload *_struct.Struct `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
+	Payload *structpb.Struct `protobuf:"bytes,4,opt,name=payload,proto3" json:"payload,omitempty"`
 	// The target to transition to. This can be set optionally to indicate an
 	// immediate transition to a different page in the same host flow, or a
 	// different flow in the same agent.
@@ -950,7 +950,7 @@ func (x *WebhookResponse) GetSessionInfo() *SessionInfo {
 	return nil
 }
 
-func (x *WebhookResponse) GetPayload() *_struct.Struct {
+func (x *WebhookResponse) GetPayload() *structpb.Struct {
 	if x != nil {
 		return x.Payload
 	}
@@ -1092,7 +1092,7 @@ type SessionInfo struct {
 	// parameter from the session, the webhook should explicitly set the parameter
 	// value to null in [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse]. The map is keyed by parameters'
 	// display names.
-	Parameters map[string]*_struct.Value `protobuf:"bytes,2,rep,name=parameters,proto3" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Parameters map[string]*structpb.Value `protobuf:"bytes,2,rep,name=parameters,proto3" json:"parameters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *SessionInfo) Reset() {
@@ -1134,7 +1134,7 @@ func (x *SessionInfo) GetSession() string {
 	return ""
 }
 
-func (x *SessionInfo) GetParameters() map[string]*_struct.Value {
+func (x *SessionInfo) GetParameters() map[string]*structpb.Value {
 	if x != nil {
 		return x.Parameters
 	}
@@ -1518,7 +1518,7 @@ type WebhookRequest_IntentInfo_IntentParameterValue struct {
 	OriginalValue string `protobuf:"bytes,1,opt,name=original_value,json=originalValue,proto3" json:"original_value,omitempty"`
 	// Always present. Structured value for the parameter extracted from user
 	// utterance.
-	ResolvedValue *_struct.Value `protobuf:"bytes,2,opt,name=resolved_value,json=resolvedValue,proto3" json:"resolved_value,omitempty"`
+	ResolvedValue *structpb.Value `protobuf:"bytes,2,opt,name=resolved_value,json=resolvedValue,proto3" json:"resolved_value,omitempty"`
 }
 
 func (x *WebhookRequest_IntentInfo_IntentParameterValue) Reset() {
@@ -1560,7 +1560,7 @@ func (x *WebhookRequest_IntentInfo_IntentParameterValue) GetOriginalValue() stri
 	return ""
 }
 
-func (x *WebhookRequest_IntentInfo_IntentParameterValue) GetResolvedValue() *_struct.Value {
+func (x *WebhookRequest_IntentInfo_IntentParameterValue) GetResolvedValue() *structpb.Value {
 	if x != nil {
 		return x.ResolvedValue
 	}
@@ -1701,7 +1701,7 @@ type PageInfo_FormInfo_ParameterInfo struct {
 	// Optional for both [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest] and [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
 	// The value of the parameter. This field can be set by the webhook to
 	// change the parameter value.
-	Value *_struct.Value `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
+	Value *structpb.Value `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
 	// Optional for [WebhookRequest][google.cloud.dialogflow.cx.v3.WebhookRequest]. Ignored for [WebhookResponse][google.cloud.dialogflow.cx.v3.WebhookResponse].
 	// Indicates if the parameter value was just collected on the last
 	// conversation turn.
@@ -1761,7 +1761,7 @@ func (x *PageInfo_FormInfo_ParameterInfo) GetState() PageInfo_FormInfo_Parameter
 	return PageInfo_FormInfo_ParameterInfo_PARAMETER_STATE_UNSPECIFIED
 }
 
-func (x *PageInfo_FormInfo_ParameterInfo) GetValue() *_struct.Value {
+func (x *PageInfo_FormInfo_ParameterInfo) GetValue() *structpb.Value {
 	if x != nil {
 		return x.Value
 	}
@@ -2252,12 +2252,12 @@ var file_google_cloud_dialogflow_cx_v3_webhook_proto_goTypes = []interface{}{
 	(*PageInfo_FormInfo)(nil),                   // 22: google.cloud.dialogflow.cx.v3.PageInfo.FormInfo
 	(*PageInfo_FormInfo_ParameterInfo)(nil),     // 23: google.cloud.dialogflow.cx.v3.PageInfo.FormInfo.ParameterInfo
 	nil,                                         // 24: google.cloud.dialogflow.cx.v3.SessionInfo.ParametersEntry
-	(*duration.Duration)(nil),                   // 25: google.protobuf.Duration
-	(*field_mask.FieldMask)(nil),                // 26: google.protobuf.FieldMask
+	(*durationpb.Duration)(nil),                 // 25: google.protobuf.Duration
+	(*fieldmaskpb.FieldMask)(nil),               // 26: google.protobuf.FieldMask
 	(*ResponseMessage)(nil),                     // 27: google.cloud.dialogflow.cx.v3.ResponseMessage
-	(*_struct.Struct)(nil),                      // 28: google.protobuf.Struct
-	(*_struct.Value)(nil),                       // 29: google.protobuf.Value
-	(*empty.Empty)(nil),                         // 30: google.protobuf.Empty
+	(*structpb.Struct)(nil),                     // 28: google.protobuf.Struct
+	(*structpb.Value)(nil),                      // 29: google.protobuf.Value
+	(*emptypb.Empty)(nil),                       // 30: google.protobuf.Empty
 }
 var file_google_cloud_dialogflow_cx_v3_webhook_proto_depIdxs = []int32{
 	13, // 0: google.cloud.dialogflow.cx.v3.Webhook.generic_web_service:type_name -> google.cloud.dialogflow.cx.v3.Webhook.GenericWebService
@@ -2612,7 +2612,7 @@ type WebhooksClient interface {
 	// Updates the specified webhook.
 	UpdateWebhook(ctx context.Context, in *UpdateWebhookRequest, opts ...grpc.CallOption) (*Webhook, error)
 	// Deletes the specified webhook.
-	DeleteWebhook(ctx context.Context, in *DeleteWebhookRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteWebhook(ctx context.Context, in *DeleteWebhookRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type webhooksClient struct {
@@ -2659,8 +2659,8 @@ func (c *webhooksClient) UpdateWebhook(ctx context.Context, in *UpdateWebhookReq
 	return out, nil
 }
 
-func (c *webhooksClient) DeleteWebhook(ctx context.Context, in *DeleteWebhookRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *webhooksClient) DeleteWebhook(ctx context.Context, in *DeleteWebhookRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.dialogflow.cx.v3.Webhooks/DeleteWebhook", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2679,7 +2679,7 @@ type WebhooksServer interface {
 	// Updates the specified webhook.
 	UpdateWebhook(context.Context, *UpdateWebhookRequest) (*Webhook, error)
 	// Deletes the specified webhook.
-	DeleteWebhook(context.Context, *DeleteWebhookRequest) (*empty.Empty, error)
+	DeleteWebhook(context.Context, *DeleteWebhookRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedWebhooksServer can be embedded to have forward compatible implementations.
@@ -2698,7 +2698,7 @@ func (*UnimplementedWebhooksServer) CreateWebhook(context.Context, *CreateWebhoo
 func (*UnimplementedWebhooksServer) UpdateWebhook(context.Context, *UpdateWebhookRequest) (*Webhook, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateWebhook not implemented")
 }
-func (*UnimplementedWebhooksServer) DeleteWebhook(context.Context, *DeleteWebhookRequest) (*empty.Empty, error) {
+func (*UnimplementedWebhooksServer) DeleteWebhook(context.Context, *DeleteWebhookRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteWebhook not implemented")
 }
 
diff --git a/dialogflow/cx/apiv3/deployments_client.go b/dialogflow/cx/apiv3/deployments_client.go
index 8193413941c..d9399c7b9b8 100644
--- a/dialogflow/cx/apiv3/deployments_client.go
+++ b/dialogflow/cx/apiv3/deployments_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/deployments_client_example_test.go b/dialogflow/cx/apiv3/deployments_client_example_test.go
index f39555998ab..c1ab6c252d3 100644
--- a/dialogflow/cx/apiv3/deployments_client_example_test.go
+++ b/dialogflow/cx/apiv3/deployments_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleDeploymentsClient_ListDeployments() {
 
 	req := &cxpb.ListDeploymentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListDeploymentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListDeploymentsRequest.
 	}
 	it := c.ListDeployments(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleDeploymentsClient_GetDeployment() {
 
 	req := &cxpb.GetDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetDeploymentRequest.
 	}
 	resp, err := c.GetDeployment(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/doc.go b/dialogflow/cx/apiv3/doc.go
index 2d85e0bcae3..134556a86c9 100644
--- a/dialogflow/cx/apiv3/doc.go
+++ b/dialogflow/cx/apiv3/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &cxpb.ListPagesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListPagesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListPagesRequest.
 //	}
 //	it := c.ListPages(ctx, req)
 //	for {
diff --git a/dialogflow/cx/apiv3/entity_types_client.go b/dialogflow/cx/apiv3/entity_types_client.go
index 13083b42351..308d04fa98f 100644
--- a/dialogflow/cx/apiv3/entity_types_client.go
+++ b/dialogflow/cx/apiv3/entity_types_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/entity_types_client_example_test.go b/dialogflow/cx/apiv3/entity_types_client_example_test.go
index 60936fa4af5..eae160d4ff3 100644
--- a/dialogflow/cx/apiv3/entity_types_client_example_test.go
+++ b/dialogflow/cx/apiv3/entity_types_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleEntityTypesClient_ListEntityTypes() {
 
 	req := &cxpb.ListEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListEntityTypesRequest.
 	}
 	it := c.ListEntityTypes(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleEntityTypesClient_GetEntityType() {
 
 	req := &cxpb.GetEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetEntityTypeRequest.
 	}
 	resp, err := c.GetEntityType(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleEntityTypesClient_CreateEntityType() {
 
 	req := &cxpb.CreateEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateEntityTypeRequest.
 	}
 	resp, err := c.CreateEntityType(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleEntityTypesClient_UpdateEntityType() {
 
 	req := &cxpb.UpdateEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateEntityTypeRequest.
 	}
 	resp, err := c.UpdateEntityType(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleEntityTypesClient_DeleteEntityType() {
 
 	req := &cxpb.DeleteEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteEntityTypeRequest.
 	}
 	err = c.DeleteEntityType(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/environments_client.go b/dialogflow/cx/apiv3/environments_client.go
index c398b6acdd2..e293585c3f9 100644
--- a/dialogflow/cx/apiv3/environments_client.go
+++ b/dialogflow/cx/apiv3/environments_client.go
@@ -23,21 +23,21 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
-	structpb "github.com/golang/protobuf/ptypes/struct"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 var newEnvironmentsClientHook clientHook
diff --git a/dialogflow/cx/apiv3/environments_client_example_test.go b/dialogflow/cx/apiv3/environments_client_example_test.go
index be276ad58cd..2b41daa576d 100644
--- a/dialogflow/cx/apiv3/environments_client_example_test.go
+++ b/dialogflow/cx/apiv3/environments_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleEnvironmentsClient_ListEnvironments() {
 
 	req := &cxpb.ListEnvironmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListEnvironmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListEnvironmentsRequest.
 	}
 	it := c.ListEnvironments(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleEnvironmentsClient_GetEnvironment() {
 
 	req := &cxpb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleEnvironmentsClient_CreateEnvironment() {
 
 	req := &cxpb.CreateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateEnvironmentRequest.
 	}
 	op, err := c.CreateEnvironment(ctx, req)
 	if err != nil {
@@ -144,7 +144,7 @@ func ExampleEnvironmentsClient_UpdateEnvironment() {
 
 	req := &cxpb.UpdateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateEnvironmentRequest.
 	}
 	op, err := c.UpdateEnvironment(ctx, req)
 	if err != nil {
@@ -174,7 +174,7 @@ func ExampleEnvironmentsClient_DeleteEnvironment() {
 
 	req := &cxpb.DeleteEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteEnvironmentRequest.
 	}
 	err = c.DeleteEnvironment(ctx, req)
 	if err != nil {
@@ -197,7 +197,7 @@ func ExampleEnvironmentsClient_LookupEnvironmentHistory() {
 
 	req := &cxpb.LookupEnvironmentHistoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#LookupEnvironmentHistoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#LookupEnvironmentHistoryRequest.
 	}
 	it := c.LookupEnvironmentHistory(ctx, req)
 	for {
@@ -228,7 +228,7 @@ func ExampleEnvironmentsClient_RunContinuousTest() {
 
 	req := &cxpb.RunContinuousTestRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#RunContinuousTestRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#RunContinuousTestRequest.
 	}
 	op, err := c.RunContinuousTest(ctx, req)
 	if err != nil {
@@ -258,7 +258,7 @@ func ExampleEnvironmentsClient_ListContinuousTestResults() {
 
 	req := &cxpb.ListContinuousTestResultsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListContinuousTestResultsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListContinuousTestResultsRequest.
 	}
 	it := c.ListContinuousTestResults(ctx, req)
 	for {
@@ -289,7 +289,7 @@ func ExampleEnvironmentsClient_DeployFlow() {
 
 	req := &cxpb.DeployFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeployFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeployFlowRequest.
 	}
 	op, err := c.DeployFlow(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/experiments_client.go b/dialogflow/cx/apiv3/experiments_client.go
index b652a960a10..da2783b4603 100644
--- a/dialogflow/cx/apiv3/experiments_client.go
+++ b/dialogflow/cx/apiv3/experiments_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/experiments_client_example_test.go b/dialogflow/cx/apiv3/experiments_client_example_test.go
index 0217b2032b7..5b5272b5305 100644
--- a/dialogflow/cx/apiv3/experiments_client_example_test.go
+++ b/dialogflow/cx/apiv3/experiments_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleExperimentsClient_ListExperiments() {
 
 	req := &cxpb.ListExperimentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListExperimentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListExperimentsRequest.
 	}
 	it := c.ListExperiments(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleExperimentsClient_GetExperiment() {
 
 	req := &cxpb.GetExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetExperimentRequest.
 	}
 	resp, err := c.GetExperiment(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleExperimentsClient_CreateExperiment() {
 
 	req := &cxpb.CreateExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateExperimentRequest.
 	}
 	resp, err := c.CreateExperiment(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleExperimentsClient_UpdateExperiment() {
 
 	req := &cxpb.UpdateExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateExperimentRequest.
 	}
 	resp, err := c.UpdateExperiment(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleExperimentsClient_DeleteExperiment() {
 
 	req := &cxpb.DeleteExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteExperimentRequest.
 	}
 	err = c.DeleteExperiment(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleExperimentsClient_StartExperiment() {
 
 	req := &cxpb.StartExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#StartExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#StartExperimentRequest.
 	}
 	resp, err := c.StartExperiment(ctx, req)
 	if err != nil {
@@ -212,7 +212,7 @@ func ExampleExperimentsClient_StopExperiment() {
 
 	req := &cxpb.StopExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#StopExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#StopExperimentRequest.
 	}
 	resp, err := c.StopExperiment(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/flows_client.go b/dialogflow/cx/apiv3/flows_client.go
index c3579638ef9..a412c294d01 100644
--- a/dialogflow/cx/apiv3/flows_client.go
+++ b/dialogflow/cx/apiv3/flows_client.go
@@ -23,21 +23,21 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
-	structpb "github.com/golang/protobuf/ptypes/struct"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 var newFlowsClientHook clientHook
diff --git a/dialogflow/cx/apiv3/flows_client_example_test.go b/dialogflow/cx/apiv3/flows_client_example_test.go
index 0714137061e..421b7870f7a 100644
--- a/dialogflow/cx/apiv3/flows_client_example_test.go
+++ b/dialogflow/cx/apiv3/flows_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleFlowsClient_CreateFlow() {
 
 	req := &cxpb.CreateFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateFlowRequest.
 	}
 	resp, err := c.CreateFlow(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleFlowsClient_DeleteFlow() {
 
 	req := &cxpb.DeleteFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteFlowRequest.
 	}
 	err = c.DeleteFlow(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleFlowsClient_ListFlows() {
 
 	req := &cxpb.ListFlowsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListFlowsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListFlowsRequest.
 	}
 	it := c.ListFlows(ctx, req)
 	for {
@@ -137,7 +137,7 @@ func ExampleFlowsClient_GetFlow() {
 
 	req := &cxpb.GetFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetFlowRequest.
 	}
 	resp, err := c.GetFlow(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleFlowsClient_UpdateFlow() {
 
 	req := &cxpb.UpdateFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateFlowRequest.
 	}
 	resp, err := c.UpdateFlow(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleFlowsClient_TrainFlow() {
 
 	req := &cxpb.TrainFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#TrainFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#TrainFlowRequest.
 	}
 	op, err := c.TrainFlow(ctx, req)
 	if err != nil {
@@ -215,7 +215,7 @@ func ExampleFlowsClient_ValidateFlow() {
 
 	req := &cxpb.ValidateFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ValidateFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ValidateFlowRequest.
 	}
 	resp, err := c.ValidateFlow(ctx, req)
 	if err != nil {
@@ -240,7 +240,7 @@ func ExampleFlowsClient_GetFlowValidationResult() {
 
 	req := &cxpb.GetFlowValidationResultRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetFlowValidationResultRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetFlowValidationResultRequest.
 	}
 	resp, err := c.GetFlowValidationResult(ctx, req)
 	if err != nil {
@@ -265,7 +265,7 @@ func ExampleFlowsClient_ImportFlow() {
 
 	req := &cxpb.ImportFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ImportFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ImportFlowRequest.
 	}
 	op, err := c.ImportFlow(ctx, req)
 	if err != nil {
@@ -295,7 +295,7 @@ func ExampleFlowsClient_ExportFlow() {
 
 	req := &cxpb.ExportFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ExportFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ExportFlowRequest.
 	}
 	op, err := c.ExportFlow(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/intents_client.go b/dialogflow/cx/apiv3/intents_client.go
index 7d4d6bc97d0..acf8d6ec515 100644
--- a/dialogflow/cx/apiv3/intents_client.go
+++ b/dialogflow/cx/apiv3/intents_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/intents_client_example_test.go b/dialogflow/cx/apiv3/intents_client_example_test.go
index 935e4b13165..eb9f66a741e 100644
--- a/dialogflow/cx/apiv3/intents_client_example_test.go
+++ b/dialogflow/cx/apiv3/intents_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleIntentsClient_ListIntents() {
 
 	req := &cxpb.ListIntentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListIntentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListIntentsRequest.
 	}
 	it := c.ListIntents(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleIntentsClient_GetIntent() {
 
 	req := &cxpb.GetIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetIntentRequest.
 	}
 	resp, err := c.GetIntent(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleIntentsClient_CreateIntent() {
 
 	req := &cxpb.CreateIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateIntentRequest.
 	}
 	resp, err := c.CreateIntent(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleIntentsClient_UpdateIntent() {
 
 	req := &cxpb.UpdateIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateIntentRequest.
 	}
 	resp, err := c.UpdateIntent(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleIntentsClient_DeleteIntent() {
 
 	req := &cxpb.DeleteIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteIntentRequest.
 	}
 	err = c.DeleteIntent(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/pages_client.go b/dialogflow/cx/apiv3/pages_client.go
index 0f146bfed2a..e6719892ab8 100644
--- a/dialogflow/cx/apiv3/pages_client.go
+++ b/dialogflow/cx/apiv3/pages_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/pages_client_example_test.go b/dialogflow/cx/apiv3/pages_client_example_test.go
index e7095d0414e..29d38eb456d 100644
--- a/dialogflow/cx/apiv3/pages_client_example_test.go
+++ b/dialogflow/cx/apiv3/pages_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExamplePagesClient_ListPages() {
 
 	req := &cxpb.ListPagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListPagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListPagesRequest.
 	}
 	it := c.ListPages(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExamplePagesClient_GetPage() {
 
 	req := &cxpb.GetPageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetPageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetPageRequest.
 	}
 	resp, err := c.GetPage(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExamplePagesClient_CreatePage() {
 
 	req := &cxpb.CreatePageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreatePageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreatePageRequest.
 	}
 	resp, err := c.CreatePage(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExamplePagesClient_UpdatePage() {
 
 	req := &cxpb.UpdatePageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdatePageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdatePageRequest.
 	}
 	resp, err := c.UpdatePage(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExamplePagesClient_DeletePage() {
 
 	req := &cxpb.DeletePageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeletePageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeletePageRequest.
 	}
 	err = c.DeletePage(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/security_settings_client.go b/dialogflow/cx/apiv3/security_settings_client.go
index 5bee237c136..81f935e960d 100644
--- a/dialogflow/cx/apiv3/security_settings_client.go
+++ b/dialogflow/cx/apiv3/security_settings_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/security_settings_client_example_test.go b/dialogflow/cx/apiv3/security_settings_client_example_test.go
index 4731cdc4598..edff6e0b283 100644
--- a/dialogflow/cx/apiv3/security_settings_client_example_test.go
+++ b/dialogflow/cx/apiv3/security_settings_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleSecuritySettingsClient_CreateSecuritySettings() {
 
 	req := &cxpb.CreateSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateSecuritySettingsRequest.
 	}
 	resp, err := c.CreateSecuritySettings(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleSecuritySettingsClient_GetSecuritySettings() {
 
 	req := &cxpb.GetSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetSecuritySettingsRequest.
 	}
 	resp, err := c.GetSecuritySettings(ctx, req)
 	if err != nil {
@@ -108,7 +108,7 @@ func ExampleSecuritySettingsClient_UpdateSecuritySettings() {
 
 	req := &cxpb.UpdateSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateSecuritySettingsRequest.
 	}
 	resp, err := c.UpdateSecuritySettings(ctx, req)
 	if err != nil {
@@ -133,7 +133,7 @@ func ExampleSecuritySettingsClient_ListSecuritySettings() {
 
 	req := &cxpb.ListSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListSecuritySettingsRequest.
 	}
 	it := c.ListSecuritySettings(ctx, req)
 	for {
@@ -164,7 +164,7 @@ func ExampleSecuritySettingsClient_DeleteSecuritySettings() {
 
 	req := &cxpb.DeleteSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteSecuritySettingsRequest.
 	}
 	err = c.DeleteSecuritySettings(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/session_entity_types_client.go b/dialogflow/cx/apiv3/session_entity_types_client.go
index 96993ccf061..8777a6e35aa 100644
--- a/dialogflow/cx/apiv3/session_entity_types_client.go
+++ b/dialogflow/cx/apiv3/session_entity_types_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/session_entity_types_client_example_test.go b/dialogflow/cx/apiv3/session_entity_types_client_example_test.go
index 0261e381ea9..1590028aac8 100644
--- a/dialogflow/cx/apiv3/session_entity_types_client_example_test.go
+++ b/dialogflow/cx/apiv3/session_entity_types_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleSessionEntityTypesClient_ListSessionEntityTypes() {
 
 	req := &cxpb.ListSessionEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListSessionEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListSessionEntityTypesRequest.
 	}
 	it := c.ListSessionEntityTypes(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleSessionEntityTypesClient_GetSessionEntityType() {
 
 	req := &cxpb.GetSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetSessionEntityTypeRequest.
 	}
 	resp, err := c.GetSessionEntityType(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleSessionEntityTypesClient_CreateSessionEntityType() {
 
 	req := &cxpb.CreateSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateSessionEntityTypeRequest.
 	}
 	resp, err := c.CreateSessionEntityType(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleSessionEntityTypesClient_UpdateSessionEntityType() {
 
 	req := &cxpb.UpdateSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateSessionEntityTypeRequest.
 	}
 	resp, err := c.UpdateSessionEntityType(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleSessionEntityTypesClient_DeleteSessionEntityType() {
 
 	req := &cxpb.DeleteSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteSessionEntityTypeRequest.
 	}
 	err = c.DeleteSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/sessions_client.go b/dialogflow/cx/apiv3/sessions_client.go
index b8da8cdcf64..33321e7650d 100644
--- a/dialogflow/cx/apiv3/sessions_client.go
+++ b/dialogflow/cx/apiv3/sessions_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/sessions_client_example_test.go b/dialogflow/cx/apiv3/sessions_client_example_test.go
index 38804cdbf59..50fd3cdbaa1 100644
--- a/dialogflow/cx/apiv3/sessions_client_example_test.go
+++ b/dialogflow/cx/apiv3/sessions_client_example_test.go
@@ -21,8 +21,8 @@ import (
 	"io"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -59,7 +59,7 @@ func ExampleSessionsClient_DetectIntent() {
 
 	req := &cxpb.DetectIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DetectIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DetectIntentRequest.
 	}
 	resp, err := c.DetectIntent(ctx, req)
 	if err != nil {
@@ -124,7 +124,7 @@ func ExampleSessionsClient_MatchIntent() {
 
 	req := &cxpb.MatchIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#MatchIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#MatchIntentRequest.
 	}
 	resp, err := c.MatchIntent(ctx, req)
 	if err != nil {
@@ -149,7 +149,7 @@ func ExampleSessionsClient_FulfillIntent() {
 
 	req := &cxpb.FulfillIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#FulfillIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#FulfillIntentRequest.
 	}
 	resp, err := c.FulfillIntent(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/test_cases_client.go b/dialogflow/cx/apiv3/test_cases_client.go
index 34fa4d6dcc4..b7c336f6c56 100644
--- a/dialogflow/cx/apiv3/test_cases_client.go
+++ b/dialogflow/cx/apiv3/test_cases_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/test_cases_client_example_test.go b/dialogflow/cx/apiv3/test_cases_client_example_test.go
index cc2add7ad6e..f0ec86e3919 100644
--- a/dialogflow/cx/apiv3/test_cases_client_example_test.go
+++ b/dialogflow/cx/apiv3/test_cases_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleTestCasesClient_ListTestCases() {
 
 	req := &cxpb.ListTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListTestCasesRequest.
 	}
 	it := c.ListTestCases(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleTestCasesClient_BatchDeleteTestCases() {
 
 	req := &cxpb.BatchDeleteTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#BatchDeleteTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#BatchDeleteTestCasesRequest.
 	}
 	err = c.BatchDeleteTestCases(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleTestCasesClient_GetTestCase() {
 
 	req := &cxpb.GetTestCaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetTestCaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetTestCaseRequest.
 	}
 	resp, err := c.GetTestCase(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleTestCasesClient_CreateTestCase() {
 
 	req := &cxpb.CreateTestCaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateTestCaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateTestCaseRequest.
 	}
 	resp, err := c.CreateTestCase(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleTestCasesClient_UpdateTestCase() {
 
 	req := &cxpb.UpdateTestCaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateTestCaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateTestCaseRequest.
 	}
 	resp, err := c.UpdateTestCase(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleTestCasesClient_RunTestCase() {
 
 	req := &cxpb.RunTestCaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#RunTestCaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#RunTestCaseRequest.
 	}
 	op, err := c.RunTestCase(ctx, req)
 	if err != nil {
@@ -217,7 +217,7 @@ func ExampleTestCasesClient_BatchRunTestCases() {
 
 	req := &cxpb.BatchRunTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#BatchRunTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#BatchRunTestCasesRequest.
 	}
 	op, err := c.BatchRunTestCases(ctx, req)
 	if err != nil {
@@ -247,7 +247,7 @@ func ExampleTestCasesClient_CalculateCoverage() {
 
 	req := &cxpb.CalculateCoverageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CalculateCoverageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CalculateCoverageRequest.
 	}
 	resp, err := c.CalculateCoverage(ctx, req)
 	if err != nil {
@@ -272,7 +272,7 @@ func ExampleTestCasesClient_ImportTestCases() {
 
 	req := &cxpb.ImportTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ImportTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ImportTestCasesRequest.
 	}
 	op, err := c.ImportTestCases(ctx, req)
 	if err != nil {
@@ -302,7 +302,7 @@ func ExampleTestCasesClient_ExportTestCases() {
 
 	req := &cxpb.ExportTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ExportTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ExportTestCasesRequest.
 	}
 	op, err := c.ExportTestCases(ctx, req)
 	if err != nil {
@@ -332,7 +332,7 @@ func ExampleTestCasesClient_ListTestCaseResults() {
 
 	req := &cxpb.ListTestCaseResultsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListTestCaseResultsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListTestCaseResultsRequest.
 	}
 	it := c.ListTestCaseResults(ctx, req)
 	for {
@@ -363,7 +363,7 @@ func ExampleTestCasesClient_GetTestCaseResult() {
 
 	req := &cxpb.GetTestCaseResultRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetTestCaseResultRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetTestCaseResultRequest.
 	}
 	resp, err := c.GetTestCaseResult(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/transition_route_groups_client.go b/dialogflow/cx/apiv3/transition_route_groups_client.go
index 5d0b26584da..9d579493813 100644
--- a/dialogflow/cx/apiv3/transition_route_groups_client.go
+++ b/dialogflow/cx/apiv3/transition_route_groups_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/transition_route_groups_client_example_test.go b/dialogflow/cx/apiv3/transition_route_groups_client_example_test.go
index 0de7cc3efe4..e468a2c61ff 100644
--- a/dialogflow/cx/apiv3/transition_route_groups_client_example_test.go
+++ b/dialogflow/cx/apiv3/transition_route_groups_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleTransitionRouteGroupsClient_ListTransitionRouteGroups() {
 
 	req := &cxpb.ListTransitionRouteGroupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListTransitionRouteGroupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListTransitionRouteGroupsRequest.
 	}
 	it := c.ListTransitionRouteGroups(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleTransitionRouteGroupsClient_GetTransitionRouteGroup() {
 
 	req := &cxpb.GetTransitionRouteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetTransitionRouteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetTransitionRouteGroupRequest.
 	}
 	resp, err := c.GetTransitionRouteGroup(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleTransitionRouteGroupsClient_CreateTransitionRouteGroup() {
 
 	req := &cxpb.CreateTransitionRouteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateTransitionRouteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateTransitionRouteGroupRequest.
 	}
 	resp, err := c.CreateTransitionRouteGroup(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleTransitionRouteGroupsClient_UpdateTransitionRouteGroup() {
 
 	req := &cxpb.UpdateTransitionRouteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateTransitionRouteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateTransitionRouteGroupRequest.
 	}
 	resp, err := c.UpdateTransitionRouteGroup(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleTransitionRouteGroupsClient_DeleteTransitionRouteGroup() {
 
 	req := &cxpb.DeleteTransitionRouteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteTransitionRouteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteTransitionRouteGroupRequest.
 	}
 	err = c.DeleteTransitionRouteGroup(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/versions_client.go b/dialogflow/cx/apiv3/versions_client.go
index 3d34e983594..4ea008ea374 100644
--- a/dialogflow/cx/apiv3/versions_client.go
+++ b/dialogflow/cx/apiv3/versions_client.go
@@ -23,21 +23,21 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
-	structpb "github.com/golang/protobuf/ptypes/struct"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 var newVersionsClientHook clientHook
diff --git a/dialogflow/cx/apiv3/versions_client_example_test.go b/dialogflow/cx/apiv3/versions_client_example_test.go
index 421c7ec437b..03b69f62729 100644
--- a/dialogflow/cx/apiv3/versions_client_example_test.go
+++ b/dialogflow/cx/apiv3/versions_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleVersionsClient_ListVersions() {
 
 	req := &cxpb.ListVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListVersionsRequest.
 	}
 	it := c.ListVersions(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleVersionsClient_GetVersion() {
 
 	req := &cxpb.GetVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetVersionRequest.
 	}
 	resp, err := c.GetVersion(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleVersionsClient_CreateVersion() {
 
 	req := &cxpb.CreateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateVersionRequest.
 	}
 	op, err := c.CreateVersion(ctx, req)
 	if err != nil {
@@ -144,7 +144,7 @@ func ExampleVersionsClient_UpdateVersion() {
 
 	req := &cxpb.UpdateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateVersionRequest.
 	}
 	resp, err := c.UpdateVersion(ctx, req)
 	if err != nil {
@@ -169,7 +169,7 @@ func ExampleVersionsClient_DeleteVersion() {
 
 	req := &cxpb.DeleteVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteVersionRequest.
 	}
 	err = c.DeleteVersion(ctx, req)
 	if err != nil {
@@ -192,7 +192,7 @@ func ExampleVersionsClient_LoadVersion() {
 
 	req := &cxpb.LoadVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#LoadVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#LoadVersionRequest.
 	}
 	op, err := c.LoadVersion(ctx, req)
 	if err != nil {
@@ -220,7 +220,7 @@ func ExampleVersionsClient_CompareVersions() {
 
 	req := &cxpb.CompareVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CompareVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CompareVersionsRequest.
 	}
 	resp, err := c.CompareVersions(ctx, req)
 	if err != nil {
diff --git a/dialogflow/cx/apiv3/webhooks_client.go b/dialogflow/cx/apiv3/webhooks_client.go
index b7bfd75e5fb..1cc7b6e8c96 100644
--- a/dialogflow/cx/apiv3/webhooks_client.go
+++ b/dialogflow/cx/apiv3/webhooks_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/dialogflow/cx/apiv3/webhooks_client_example_test.go b/dialogflow/cx/apiv3/webhooks_client_example_test.go
index 501233e158a..07f3b0ba5f0 100644
--- a/dialogflow/cx/apiv3/webhooks_client_example_test.go
+++ b/dialogflow/cx/apiv3/webhooks_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleWebhooksClient_ListWebhooks() {
 
 	req := &cxpb.ListWebhooksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListWebhooksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListWebhooksRequest.
 	}
 	it := c.ListWebhooks(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleWebhooksClient_GetWebhook() {
 
 	req := &cxpb.GetWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetWebhookRequest.
 	}
 	resp, err := c.GetWebhook(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleWebhooksClient_CreateWebhook() {
 
 	req := &cxpb.CreateWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateWebhookRequest.
 	}
 	resp, err := c.CreateWebhook(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleWebhooksClient_UpdateWebhook() {
 
 	req := &cxpb.UpdateWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateWebhookRequest.
 	}
 	resp, err := c.UpdateWebhook(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleWebhooksClient_DeleteWebhook() {
 
 	req := &cxpb.DeleteWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteWebhookRequest.
 	}
 	err = c.DeleteWebhook(ctx, req)
 	if err != nil {
diff --git a/dialogflow/go.mod b/dialogflow/go.mod
index a9736dfc2c1..0c4658b6b6e 100644
--- a/dialogflow/go.mod
+++ b/dialogflow/go.mod
@@ -3,16 +3,17 @@ module cloud.google.com/go/dialogflow
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.100.0
-	google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
@@ -21,6 +22,6 @@ require (
 	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/dialogflow/go.sum b/dialogflow/go.sum
index 9306af8cb39..197b62f3d3c 100644
--- a/dialogflow/go.sum
+++ b/dialogflow/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -79,8 +81,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/dlp/aliasshim/aliasshim.go b/dlp/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/dlp/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/dlp/apiv2/dlp_client.go b/dlp/apiv2/dlp_client.go
index afea8964b49..20edfd672f4 100644
--- a/dlp/apiv2/dlp_client.go
+++ b/dlp/apiv2/dlp_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/dlp/apiv2/dlp_client_example_test.go b/dlp/apiv2/dlp_client_example_test.go
index 198a65b0f60..eceb6de8f1f 100644
--- a/dlp/apiv2/dlp_client_example_test.go
+++ b/dlp/apiv2/dlp_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 	"google.golang.org/api/iterator"
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_InspectContent() {
 
 	req := &dlppb.InspectContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#InspectContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#InspectContentRequest.
 	}
 	resp, err := c.InspectContent(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_RedactImage() {
 
 	req := &dlppb.RedactImageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#RedactImageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#RedactImageRequest.
 	}
 	resp, err := c.RedactImage(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleClient_DeidentifyContent() {
 
 	req := &dlppb.DeidentifyContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeidentifyContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeidentifyContentRequest.
 	}
 	resp, err := c.DeidentifyContent(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleClient_ReidentifyContent() {
 
 	req := &dlppb.ReidentifyContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ReidentifyContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ReidentifyContentRequest.
 	}
 	resp, err := c.ReidentifyContent(ctx, req)
 	if err != nil {
@@ -156,7 +156,7 @@ func ExampleClient_ListInfoTypes() {
 
 	req := &dlppb.ListInfoTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListInfoTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListInfoTypesRequest.
 	}
 	resp, err := c.ListInfoTypes(ctx, req)
 	if err != nil {
@@ -181,7 +181,7 @@ func ExampleClient_CreateInspectTemplate() {
 
 	req := &dlppb.CreateInspectTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateInspectTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateInspectTemplateRequest.
 	}
 	resp, err := c.CreateInspectTemplate(ctx, req)
 	if err != nil {
@@ -206,7 +206,7 @@ func ExampleClient_UpdateInspectTemplate() {
 
 	req := &dlppb.UpdateInspectTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#UpdateInspectTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#UpdateInspectTemplateRequest.
 	}
 	resp, err := c.UpdateInspectTemplate(ctx, req)
 	if err != nil {
@@ -231,7 +231,7 @@ func ExampleClient_GetInspectTemplate() {
 
 	req := &dlppb.GetInspectTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetInspectTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetInspectTemplateRequest.
 	}
 	resp, err := c.GetInspectTemplate(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleClient_ListInspectTemplates() {
 
 	req := &dlppb.ListInspectTemplatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListInspectTemplatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListInspectTemplatesRequest.
 	}
 	it := c.ListInspectTemplates(ctx, req)
 	for {
@@ -287,7 +287,7 @@ func ExampleClient_DeleteInspectTemplate() {
 
 	req := &dlppb.DeleteInspectTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteInspectTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteInspectTemplateRequest.
 	}
 	err = c.DeleteInspectTemplate(ctx, req)
 	if err != nil {
@@ -310,7 +310,7 @@ func ExampleClient_CreateDeidentifyTemplate() {
 
 	req := &dlppb.CreateDeidentifyTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateDeidentifyTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateDeidentifyTemplateRequest.
 	}
 	resp, err := c.CreateDeidentifyTemplate(ctx, req)
 	if err != nil {
@@ -335,7 +335,7 @@ func ExampleClient_UpdateDeidentifyTemplate() {
 
 	req := &dlppb.UpdateDeidentifyTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#UpdateDeidentifyTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#UpdateDeidentifyTemplateRequest.
 	}
 	resp, err := c.UpdateDeidentifyTemplate(ctx, req)
 	if err != nil {
@@ -360,7 +360,7 @@ func ExampleClient_GetDeidentifyTemplate() {
 
 	req := &dlppb.GetDeidentifyTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetDeidentifyTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetDeidentifyTemplateRequest.
 	}
 	resp, err := c.GetDeidentifyTemplate(ctx, req)
 	if err != nil {
@@ -385,7 +385,7 @@ func ExampleClient_ListDeidentifyTemplates() {
 
 	req := &dlppb.ListDeidentifyTemplatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListDeidentifyTemplatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListDeidentifyTemplatesRequest.
 	}
 	it := c.ListDeidentifyTemplates(ctx, req)
 	for {
@@ -416,7 +416,7 @@ func ExampleClient_DeleteDeidentifyTemplate() {
 
 	req := &dlppb.DeleteDeidentifyTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteDeidentifyTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteDeidentifyTemplateRequest.
 	}
 	err = c.DeleteDeidentifyTemplate(ctx, req)
 	if err != nil {
@@ -439,7 +439,7 @@ func ExampleClient_CreateJobTrigger() {
 
 	req := &dlppb.CreateJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateJobTriggerRequest.
 	}
 	resp, err := c.CreateJobTrigger(ctx, req)
 	if err != nil {
@@ -464,7 +464,7 @@ func ExampleClient_UpdateJobTrigger() {
 
 	req := &dlppb.UpdateJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#UpdateJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#UpdateJobTriggerRequest.
 	}
 	resp, err := c.UpdateJobTrigger(ctx, req)
 	if err != nil {
@@ -489,7 +489,7 @@ func ExampleClient_HybridInspectJobTrigger() {
 
 	req := &dlppb.HybridInspectJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#HybridInspectJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#HybridInspectJobTriggerRequest.
 	}
 	resp, err := c.HybridInspectJobTrigger(ctx, req)
 	if err != nil {
@@ -514,7 +514,7 @@ func ExampleClient_GetJobTrigger() {
 
 	req := &dlppb.GetJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetJobTriggerRequest.
 	}
 	resp, err := c.GetJobTrigger(ctx, req)
 	if err != nil {
@@ -539,7 +539,7 @@ func ExampleClient_ListJobTriggers() {
 
 	req := &dlppb.ListJobTriggersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListJobTriggersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListJobTriggersRequest.
 	}
 	it := c.ListJobTriggers(ctx, req)
 	for {
@@ -570,7 +570,7 @@ func ExampleClient_DeleteJobTrigger() {
 
 	req := &dlppb.DeleteJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteJobTriggerRequest.
 	}
 	err = c.DeleteJobTrigger(ctx, req)
 	if err != nil {
@@ -593,7 +593,7 @@ func ExampleClient_ActivateJobTrigger() {
 
 	req := &dlppb.ActivateJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ActivateJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ActivateJobTriggerRequest.
 	}
 	resp, err := c.ActivateJobTrigger(ctx, req)
 	if err != nil {
@@ -618,7 +618,7 @@ func ExampleClient_CreateDlpJob() {
 
 	req := &dlppb.CreateDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateDlpJobRequest.
 	}
 	resp, err := c.CreateDlpJob(ctx, req)
 	if err != nil {
@@ -643,7 +643,7 @@ func ExampleClient_ListDlpJobs() {
 
 	req := &dlppb.ListDlpJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListDlpJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListDlpJobsRequest.
 	}
 	it := c.ListDlpJobs(ctx, req)
 	for {
@@ -674,7 +674,7 @@ func ExampleClient_GetDlpJob() {
 
 	req := &dlppb.GetDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetDlpJobRequest.
 	}
 	resp, err := c.GetDlpJob(ctx, req)
 	if err != nil {
@@ -699,7 +699,7 @@ func ExampleClient_DeleteDlpJob() {
 
 	req := &dlppb.DeleteDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteDlpJobRequest.
 	}
 	err = c.DeleteDlpJob(ctx, req)
 	if err != nil {
@@ -722,7 +722,7 @@ func ExampleClient_CancelDlpJob() {
 
 	req := &dlppb.CancelDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CancelDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CancelDlpJobRequest.
 	}
 	err = c.CancelDlpJob(ctx, req)
 	if err != nil {
@@ -745,7 +745,7 @@ func ExampleClient_CreateStoredInfoType() {
 
 	req := &dlppb.CreateStoredInfoTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateStoredInfoTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateStoredInfoTypeRequest.
 	}
 	resp, err := c.CreateStoredInfoType(ctx, req)
 	if err != nil {
@@ -770,7 +770,7 @@ func ExampleClient_UpdateStoredInfoType() {
 
 	req := &dlppb.UpdateStoredInfoTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#UpdateStoredInfoTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#UpdateStoredInfoTypeRequest.
 	}
 	resp, err := c.UpdateStoredInfoType(ctx, req)
 	if err != nil {
@@ -795,7 +795,7 @@ func ExampleClient_GetStoredInfoType() {
 
 	req := &dlppb.GetStoredInfoTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetStoredInfoTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetStoredInfoTypeRequest.
 	}
 	resp, err := c.GetStoredInfoType(ctx, req)
 	if err != nil {
@@ -820,7 +820,7 @@ func ExampleClient_ListStoredInfoTypes() {
 
 	req := &dlppb.ListStoredInfoTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListStoredInfoTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListStoredInfoTypesRequest.
 	}
 	it := c.ListStoredInfoTypes(ctx, req)
 	for {
@@ -851,7 +851,7 @@ func ExampleClient_DeleteStoredInfoType() {
 
 	req := &dlppb.DeleteStoredInfoTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteStoredInfoTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteStoredInfoTypeRequest.
 	}
 	err = c.DeleteStoredInfoType(ctx, req)
 	if err != nil {
@@ -874,7 +874,7 @@ func ExampleClient_HybridInspectDlpJob() {
 
 	req := &dlppb.HybridInspectDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#HybridInspectDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#HybridInspectDlpJobRequest.
 	}
 	resp, err := c.HybridInspectDlpJob(ctx, req)
 	if err != nil {
@@ -899,7 +899,7 @@ func ExampleClient_FinishDlpJob() {
 
 	req := &dlppb.FinishDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#FinishDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#FinishDlpJobRequest.
 	}
 	err = c.FinishDlpJob(ctx, req)
 	if err != nil {
diff --git a/dlp/apiv2/dlppb/dlp.pb.go b/dlp/apiv2/dlppb/dlp.pb.go
index 538f25ba24f..143b790d71a 100644
--- a/dlp/apiv2/dlppb/dlp.pb.go
+++ b/dlp/apiv2/dlppb/dlp.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/privacy/dlp/v2/dlp.proto
 
 package dlppb
@@ -25,20 +25,20 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -2840,7 +2840,7 @@ type Finding struct {
 	// Where the content was found.
 	Location *Location `protobuf:"bytes,4,opt,name=location,proto3" json:"location,omitempty"`
 	// Timestamp when finding was detected.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Contains data parsed from quotes. Only populated if include_quote was set
 	// to true and a supported infoType was requested. Currently supported
 	// infoTypes: DATE, DATE_OF_BIRTH and TIME.
@@ -2864,7 +2864,7 @@ type Finding struct {
 	// * `"pipeline" : "etl"`
 	Labels map[string]string `protobuf:"bytes,10,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Time the job started that produced this finding.
-	JobCreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=job_create_time,json=jobCreateTime,proto3" json:"job_create_time,omitempty"`
+	JobCreateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=job_create_time,json=jobCreateTime,proto3" json:"job_create_time,omitempty"`
 	// The job that stored the finding.
 	JobName string `protobuf:"bytes,13,opt,name=job_name,json=jobName,proto3" json:"job_name,omitempty"`
 	// The unique finding id.
@@ -2938,7 +2938,7 @@ func (x *Finding) GetLocation() *Location {
 	return nil
 }
 
-func (x *Finding) GetCreateTime() *timestamp.Timestamp {
+func (x *Finding) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -2973,7 +2973,7 @@ func (x *Finding) GetLabels() map[string]string {
 	return nil
 }
 
-func (x *Finding) GetJobCreateTime() *timestamp.Timestamp {
+func (x *Finding) GetJobCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.JobCreateTime
 	}
@@ -3108,7 +3108,7 @@ type ContentLocation struct {
 	// this field contains the last file modification timestamp. For a BigQuery
 	// table, this field contains the last_modified_time property. For Datastore,
 	// this field isn't populated.
-	ContainerTimestamp *timestamp.Timestamp `protobuf:"bytes,6,opt,name=container_timestamp,json=containerTimestamp,proto3" json:"container_timestamp,omitempty"`
+	ContainerTimestamp *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=container_timestamp,json=containerTimestamp,proto3" json:"container_timestamp,omitempty"`
 	// Finding container version, if available
 	// ("generation" for Cloud Storage).
 	ContainerVersion string `protobuf:"bytes,7,opt,name=container_version,json=containerVersion,proto3" json:"container_version,omitempty"`
@@ -3188,7 +3188,7 @@ func (x *ContentLocation) GetMetadataLocation() *MetadataLocation {
 	return nil
 }
 
-func (x *ContentLocation) GetContainerTimestamp() *timestamp.Timestamp {
+func (x *ContentLocation) GetContainerTimestamp() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ContainerTimestamp
 	}
@@ -3571,7 +3571,7 @@ type Container struct {
 	// Storage, this field contains the last file modification timestamp. For a
 	// BigQuery table, this field contains the last_modified_time property. For
 	// Datastore, this field isn't populated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Findings container version, if available
 	// ("generation" for Cloud Storage).
 	Version string `protobuf:"bytes,7,opt,name=version,proto3" json:"version,omitempty"`
@@ -3644,7 +3644,7 @@ func (x *Container) GetRelativePath() string {
 	return ""
 }
 
-func (x *Container) GetUpdateTime() *timestamp.Timestamp {
+func (x *Container) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -5450,7 +5450,7 @@ func (x *QuasiId) GetCustomTag() string {
 	return ""
 }
 
-func (x *QuasiId) GetInferred() *empty.Empty {
+func (x *QuasiId) GetInferred() *emptypb.Empty {
 	if x, ok := x.GetTag().(*QuasiId_Inferred); ok {
 		return x.Inferred
 	}
@@ -5480,7 +5480,7 @@ type QuasiId_CustomTag struct {
 type QuasiId_Inferred struct {
 	// If no semantic tag is indicated, we infer the statistical model from
 	// the distribution of values in the input data
-	Inferred *empty.Empty `protobuf:"bytes,4,opt,name=inferred,proto3,oneof"`
+	Inferred *emptypb.Empty `protobuf:"bytes,4,opt,name=inferred,proto3,oneof"`
 }
 
 func (*QuasiId_InfoType) isQuasiId_Tag() {}
@@ -6035,7 +6035,7 @@ func (x *Value) GetBooleanValue() bool {
 	return false
 }
 
-func (x *Value) GetTimestampValue() *timestamp.Timestamp {
+func (x *Value) GetTimestampValue() *timestamppb.Timestamp {
 	if x, ok := x.GetType().(*Value_TimestampValue); ok {
 		return x.TimestampValue
 	}
@@ -6089,7 +6089,7 @@ type Value_BooleanValue struct {
 
 type Value_TimestampValue struct {
 	// timestamp
-	TimestampValue *timestamp.Timestamp `protobuf:"bytes,5,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
+	TimestampValue *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
 }
 
 type Value_TimeValue struct {
@@ -8901,7 +8901,7 @@ type RecordTransformation struct {
 	// For record transformations, provide a field.
 	FieldId *FieldId `protobuf:"bytes,1,opt,name=field_id,json=fieldId,proto3" json:"field_id,omitempty"`
 	// Findings container modification timestamp, if applicable.
-	ContainerTimestamp *timestamp.Timestamp `protobuf:"bytes,2,opt,name=container_timestamp,json=containerTimestamp,proto3" json:"container_timestamp,omitempty"`
+	ContainerTimestamp *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=container_timestamp,json=containerTimestamp,proto3" json:"container_timestamp,omitempty"`
 	// Container version, if available ("generation" for Cloud Storage).
 	ContainerVersion string `protobuf:"bytes,3,opt,name=container_version,json=containerVersion,proto3" json:"container_version,omitempty"`
 }
@@ -8945,7 +8945,7 @@ func (x *RecordTransformation) GetFieldId() *FieldId {
 	return nil
 }
 
-func (x *RecordTransformation) GetContainerTimestamp() *timestamp.Timestamp {
+func (x *RecordTransformation) GetContainerTimestamp() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ContainerTimestamp
 	}
@@ -9144,7 +9144,7 @@ func (m *Schedule) GetOption() isSchedule_Option {
 	return nil
 }
 
-func (x *Schedule) GetRecurrencePeriodDuration() *duration.Duration {
+func (x *Schedule) GetRecurrencePeriodDuration() *durationpb.Duration {
 	if x, ok := x.GetOption().(*Schedule_RecurrencePeriodDuration); ok {
 		return x.RecurrencePeriodDuration
 	}
@@ -9164,7 +9164,7 @@ type Schedule_RecurrencePeriodDuration struct {
 	//
 	// This value must be set to a time duration greater than or equal
 	// to 1 day and can be no longer than 60 days.
-	RecurrencePeriodDuration *duration.Duration `protobuf:"bytes,1,opt,name=recurrence_period_duration,json=recurrencePeriodDuration,proto3,oneof"`
+	RecurrencePeriodDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=recurrence_period_duration,json=recurrencePeriodDuration,proto3,oneof"`
 }
 
 func (*Schedule_RecurrencePeriodDuration) isSchedule_Option() {}
@@ -9229,9 +9229,9 @@ type InspectTemplate struct {
 	// Short description (max 256 chars).
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The creation timestamp of an inspectTemplate.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update timestamp of an inspectTemplate.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The core content of the template. Configuration of the scanning process.
 	InspectConfig *InspectConfig `protobuf:"bytes,6,opt,name=inspect_config,json=inspectConfig,proto3" json:"inspect_config,omitempty"`
 }
@@ -9289,14 +9289,14 @@ func (x *InspectTemplate) GetDescription() string {
 	return ""
 }
 
-func (x *InspectTemplate) GetCreateTime() *timestamp.Timestamp {
+func (x *InspectTemplate) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *InspectTemplate) GetUpdateTime() *timestamp.Timestamp {
+func (x *InspectTemplate) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -9328,9 +9328,9 @@ type DeidentifyTemplate struct {
 	// Short description (max 256 chars).
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The creation timestamp of an inspectTemplate.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update timestamp of an inspectTemplate.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The core content of the template.
 	DeidentifyConfig *DeidentifyConfig `protobuf:"bytes,6,opt,name=deidentify_config,json=deidentifyConfig,proto3" json:"deidentify_config,omitempty"`
 }
@@ -9388,14 +9388,14 @@ func (x *DeidentifyTemplate) GetDescription() string {
 	return ""
 }
 
-func (x *DeidentifyTemplate) GetCreateTime() *timestamp.Timestamp {
+func (x *DeidentifyTemplate) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *DeidentifyTemplate) GetUpdateTime() *timestamp.Timestamp {
+func (x *DeidentifyTemplate) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -9419,7 +9419,7 @@ type Error struct {
 	// Detailed error codes and messages.
 	Details *status.Status `protobuf:"bytes,1,opt,name=details,proto3" json:"details,omitempty"`
 	// The times the error occurred.
-	Timestamps []*timestamp.Timestamp `protobuf:"bytes,2,rep,name=timestamps,proto3" json:"timestamps,omitempty"`
+	Timestamps []*timestamppb.Timestamp `protobuf:"bytes,2,rep,name=timestamps,proto3" json:"timestamps,omitempty"`
 }
 
 func (x *Error) Reset() {
@@ -9461,7 +9461,7 @@ func (x *Error) GetDetails() *status.Status {
 	return nil
 }
 
-func (x *Error) GetTimestamps() []*timestamp.Timestamp {
+func (x *Error) GetTimestamps() []*timestamppb.Timestamp {
 	if x != nil {
 		return x.Timestamps
 	}
@@ -9499,11 +9499,11 @@ type JobTrigger struct {
 	// this list will be cleared.
 	Errors []*Error `protobuf:"bytes,6,rep,name=errors,proto3" json:"errors,omitempty"`
 	// Output only. The creation timestamp of a triggeredJob.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update timestamp of a triggeredJob.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The timestamp of the last time this trigger executed.
-	LastRunTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=last_run_time,json=lastRunTime,proto3" json:"last_run_time,omitempty"`
+	LastRunTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=last_run_time,json=lastRunTime,proto3" json:"last_run_time,omitempty"`
 	// Required. A status for this trigger.
 	Status JobTrigger_Status `protobuf:"varint,10,opt,name=status,proto3,enum=google.privacy.dlp.v2.JobTrigger_Status" json:"status,omitempty"`
 }
@@ -9589,21 +9589,21 @@ func (x *JobTrigger) GetErrors() []*Error {
 	return nil
 }
 
-func (x *JobTrigger) GetCreateTime() *timestamp.Timestamp {
+func (x *JobTrigger) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *JobTrigger) GetUpdateTime() *timestamp.Timestamp {
+func (x *JobTrigger) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *JobTrigger) GetLastRunTime() *timestamp.Timestamp {
+func (x *JobTrigger) GetLastRunTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastRunTime
 	}
@@ -9983,7 +9983,7 @@ type UpdateInspectTemplateRequest struct {
 	// New InspectTemplate value.
 	InspectTemplate *InspectTemplate `protobuf:"bytes,2,opt,name=inspect_template,json=inspectTemplate,proto3" json:"inspect_template,omitempty"`
 	// Mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateInspectTemplateRequest) Reset() {
@@ -10032,7 +10032,7 @@ func (x *UpdateInspectTemplateRequest) GetInspectTemplate() *InspectTemplate {
 	return nil
 }
 
-func (x *UpdateInspectTemplateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateInspectTemplateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -10474,7 +10474,7 @@ type UpdateJobTriggerRequest struct {
 	// New JobTrigger value.
 	JobTrigger *JobTrigger `protobuf:"bytes,2,opt,name=job_trigger,json=jobTrigger,proto3" json:"job_trigger,omitempty"`
 	// Mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateJobTriggerRequest) Reset() {
@@ -10523,7 +10523,7 @@ func (x *UpdateJobTriggerRequest) GetJobTrigger() *JobTrigger {
 	return nil
 }
 
-func (x *UpdateJobTriggerRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateJobTriggerRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -11346,11 +11346,11 @@ type DlpJob struct {
 	//	*DlpJob_InspectDetails
 	Details isDlpJob_Details `protobuf_oneof:"details"`
 	// Time when the job was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time when the job started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time when the job finished.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// If created by a job trigger, the resource name of the trigger that
 	// instantiated the job.
 	JobTriggerName string `protobuf:"bytes,10,opt,name=job_trigger_name,json=jobTriggerName,proto3" json:"job_trigger_name,omitempty"`
@@ -11432,21 +11432,21 @@ func (x *DlpJob) GetInspectDetails() *InspectDataSourceDetails {
 	return nil
 }
 
-func (x *DlpJob) GetCreateTime() *timestamp.Timestamp {
+func (x *DlpJob) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *DlpJob) GetStartTime() *timestamp.Timestamp {
+func (x *DlpJob) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *DlpJob) GetEndTime() *timestamp.Timestamp {
+func (x *DlpJob) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -12009,7 +12009,7 @@ type UpdateDeidentifyTemplateRequest struct {
 	// New DeidentifyTemplate value.
 	DeidentifyTemplate *DeidentifyTemplate `protobuf:"bytes,2,opt,name=deidentify_template,json=deidentifyTemplate,proto3" json:"deidentify_template,omitempty"`
 	// Mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateDeidentifyTemplateRequest) Reset() {
@@ -12058,7 +12058,7 @@ func (x *UpdateDeidentifyTemplateRequest) GetDeidentifyTemplate() *DeidentifyTem
 	return nil
 }
 
-func (x *UpdateDeidentifyTemplateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDeidentifyTemplateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -12698,7 +12698,7 @@ type StoredInfoTypeVersion struct {
 	Config *StoredInfoTypeConfig `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
 	// Create timestamp of the version. Read-only, determined by the system
 	// when the version is created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Stored info type version state. Read-only, updated by the system
 	// during dictionary creation.
 	State StoredInfoTypeState `protobuf:"varint,3,opt,name=state,proto3,enum=google.privacy.dlp.v2.StoredInfoTypeState" json:"state,omitempty"`
@@ -12759,7 +12759,7 @@ func (x *StoredInfoTypeVersion) GetConfig() *StoredInfoTypeConfig {
 	return nil
 }
 
-func (x *StoredInfoTypeVersion) GetCreateTime() *timestamp.Timestamp {
+func (x *StoredInfoTypeVersion) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -12969,7 +12969,7 @@ type UpdateStoredInfoTypeRequest struct {
 	// configuration.
 	Config *StoredInfoTypeConfig `protobuf:"bytes,2,opt,name=config,proto3" json:"config,omitempty"`
 	// Mask to control which fields get updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateStoredInfoTypeRequest) Reset() {
@@ -13018,7 +13018,7 @@ func (x *UpdateStoredInfoTypeRequest) GetConfig() *StoredInfoTypeConfig {
 	return nil
 }
 
-func (x *UpdateStoredInfoTypeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateStoredInfoTypeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -13774,9 +13774,9 @@ type TableDataProfile struct {
 	// The snapshot of the configurations used to generate the profile.
 	ConfigSnapshot *DataProfileConfigSnapshot `protobuf:"bytes,7,opt,name=config_snapshot,json=configSnapshot,proto3" json:"config_snapshot,omitempty"`
 	// The time when this table was last modified
-	LastModifiedTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=last_modified_time,json=lastModifiedTime,proto3" json:"last_modified_time,omitempty"`
+	LastModifiedTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=last_modified_time,json=lastModifiedTime,proto3" json:"last_modified_time,omitempty"`
 	// Optional. The time when this table expires.
-	ExpirationTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
+	ExpirationTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
 	// The number of columns profiled in the table.
 	ScannedColumnCount int64 `protobuf:"varint,10,opt,name=scanned_column_count,json=scannedColumnCount,proto3" json:"scanned_column_count,omitempty"`
 	// The number of columns skipped in the table because of an error.
@@ -13790,11 +13790,11 @@ type TableDataProfile struct {
 	// How broadly a resource has been shared.
 	ResourceVisibility ResourceVisibility `protobuf:"varint,15,opt,name=resource_visibility,json=resourceVisibility,proto3,enum=google.privacy.dlp.v2.ResourceVisibility" json:"resource_visibility,omitempty"`
 	// The last time the profile was generated.
-	ProfileLastGenerated *timestamp.Timestamp `protobuf:"bytes,16,opt,name=profile_last_generated,json=profileLastGenerated,proto3" json:"profile_last_generated,omitempty"`
+	ProfileLastGenerated *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=profile_last_generated,json=profileLastGenerated,proto3" json:"profile_last_generated,omitempty"`
 	// The labels applied to the resource at the time the profile was generated.
 	ResourceLabels map[string]string `protobuf:"bytes,17,rep,name=resource_labels,json=resourceLabels,proto3" json:"resource_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The time at which the table was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,23,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,23,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *TableDataProfile) Reset() {
@@ -13927,14 +13927,14 @@ func (x *TableDataProfile) GetConfigSnapshot() *DataProfileConfigSnapshot {
 	return nil
 }
 
-func (x *TableDataProfile) GetLastModifiedTime() *timestamp.Timestamp {
+func (x *TableDataProfile) GetLastModifiedTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastModifiedTime
 	}
 	return nil
 }
 
-func (x *TableDataProfile) GetExpirationTime() *timestamp.Timestamp {
+func (x *TableDataProfile) GetExpirationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpirationTime
 	}
@@ -13983,7 +13983,7 @@ func (x *TableDataProfile) GetResourceVisibility() ResourceVisibility {
 	return ResourceVisibility_RESOURCE_VISIBILITY_UNSPECIFIED
 }
 
-func (x *TableDataProfile) GetProfileLastGenerated() *timestamp.Timestamp {
+func (x *TableDataProfile) GetProfileLastGenerated() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ProfileLastGenerated
 	}
@@ -13997,7 +13997,7 @@ func (x *TableDataProfile) GetResourceLabels() map[string]string {
 	return nil
 }
 
-func (x *TableDataProfile) GetCreateTime() *timestamp.Timestamp {
+func (x *TableDataProfile) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -14012,7 +14012,7 @@ type ProfileStatus struct {
 	// Profiling status code and optional message
 	Status *status.Status `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
 	// Time when the profile generation status was updated
-	Timestamp *timestamp.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	Timestamp *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 }
 
 func (x *ProfileStatus) Reset() {
@@ -14054,7 +14054,7 @@ func (x *ProfileStatus) GetStatus() *status.Status {
 	return nil
 }
 
-func (x *ProfileStatus) GetTimestamp() *timestamp.Timestamp {
+func (x *ProfileStatus) GetTimestamp() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Timestamp
 	}
@@ -15248,7 +15248,7 @@ func (x *PrivacyMetric_KMapEstimationConfig_TaggedField) GetCustomTag() string {
 	return ""
 }
 
-func (x *PrivacyMetric_KMapEstimationConfig_TaggedField) GetInferred() *empty.Empty {
+func (x *PrivacyMetric_KMapEstimationConfig_TaggedField) GetInferred() *emptypb.Empty {
 	if x, ok := x.GetTag().(*PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred); ok {
 		return x.Inferred
 	}
@@ -15278,7 +15278,7 @@ type PrivacyMetric_KMapEstimationConfig_TaggedField_CustomTag struct {
 type PrivacyMetric_KMapEstimationConfig_TaggedField_Inferred struct {
 	// If no semantic tag is indicated, we infer the statistical model from
 	// the distribution of values in the input data
-	Inferred *empty.Empty `protobuf:"bytes,4,opt,name=inferred,proto3,oneof"`
+	Inferred *emptypb.Empty `protobuf:"bytes,4,opt,name=inferred,proto3,oneof"`
 }
 
 func (*PrivacyMetric_KMapEstimationConfig_TaggedField_InfoType) isPrivacyMetric_KMapEstimationConfig_TaggedField_Tag() {
@@ -22121,17 +22121,17 @@ var file_google_privacy_dlp_v2_dlp_proto_goTypes = []interface{}{
 	(Likelihood)(0),                                  // 240: google.privacy.dlp.v2.Likelihood
 	(*CustomInfoType)(nil),                           // 241: google.privacy.dlp.v2.CustomInfoType
 	(*FieldId)(nil),                                  // 242: google.privacy.dlp.v2.FieldId
-	(*timestamp.Timestamp)(nil),                      // 243: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                    // 243: google.protobuf.Timestamp
 	(*RecordKey)(nil),                                // 244: google.privacy.dlp.v2.RecordKey
 	(*BigQueryTable)(nil),                            // 245: google.privacy.dlp.v2.BigQueryTable
-	(*empty.Empty)(nil),                              // 246: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                            // 246: google.protobuf.Empty
 	(*timeofday.TimeOfDay)(nil),                      // 247: google.type.TimeOfDay
 	(*date.Date)(nil),                                // 248: google.type.Date
 	(dayofweek.DayOfWeek)(0),                         // 249: google.type.DayOfWeek
 	(*CustomInfoType_Dictionary_WordList)(nil),       // 250: google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList
 	(*status.Status)(nil),                            // 251: google.rpc.Status
-	(*duration.Duration)(nil),                        // 252: google.protobuf.Duration
-	(*field_mask.FieldMask)(nil),                     // 253: google.protobuf.FieldMask
+	(*durationpb.Duration)(nil),                      // 252: google.protobuf.Duration
+	(*fieldmaskpb.FieldMask)(nil),                    // 253: google.protobuf.FieldMask
 	(*StorageConfig)(nil),                            // 254: google.privacy.dlp.v2.StorageConfig
 	(*CloudStoragePath)(nil),                         // 255: google.privacy.dlp.v2.CloudStoragePath
 	(*CloudStorageFileSet)(nil),                      // 256: google.privacy.dlp.v2.CloudStorageFileSet
@@ -25292,7 +25292,7 @@ type DlpServiceClient interface {
 	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)
+	DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates a DeidentifyTemplate for reusing frequently used configuration
 	// for de-identifying content, images, and storage.
 	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
@@ -25313,7 +25313,7 @@ type DlpServiceClient interface {
 	// 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)
+	DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*emptypb.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.
@@ -25333,7 +25333,7 @@ type DlpServiceClient interface {
 	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)
+	DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*emptypb.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)
@@ -25358,13 +25358,13 @@ type DlpServiceClient interface {
 	// 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)
+	DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*emptypb.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)
+	CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*emptypb.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.
@@ -25385,14 +25385,14 @@ type DlpServiceClient interface {
 	// 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)
+	DeleteStoredInfoType(ctx context.Context, in *DeleteStoredInfoTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Inspect hybrid content and store findings to a job.
 	// To review the findings, inspect the job. Inspection will occur
 	// asynchronously.
 	HybridInspectDlpJob(ctx context.Context, in *HybridInspectDlpJobRequest, opts ...grpc.CallOption) (*HybridInspectResponse, error)
 	// Finish a running hybrid DlpJob. Triggers the finalization steps and running
 	// of any enabled actions that have not yet run.
-	FinishDlpJob(ctx context.Context, in *FinishDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	FinishDlpJob(ctx context.Context, in *FinishDlpJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type dlpServiceClient struct {
@@ -25484,8 +25484,8 @@ func (c *dlpServiceClient) ListInspectTemplates(ctx context.Context, in *ListIns
 	return out, nil
 }
 
-func (c *dlpServiceClient) DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dlpServiceClient) DeleteInspectTemplate(ctx context.Context, in *DeleteInspectTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteInspectTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -25529,8 +25529,8 @@ func (c *dlpServiceClient) ListDeidentifyTemplates(ctx context.Context, in *List
 	return out, nil
 }
 
-func (c *dlpServiceClient) DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dlpServiceClient) DeleteDeidentifyTemplate(ctx context.Context, in *DeleteDeidentifyTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteDeidentifyTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -25583,8 +25583,8 @@ func (c *dlpServiceClient) ListJobTriggers(ctx context.Context, in *ListJobTrigg
 	return out, nil
 }
 
-func (c *dlpServiceClient) DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dlpServiceClient) DeleteJobTrigger(ctx context.Context, in *DeleteJobTriggerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteJobTrigger", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -25628,8 +25628,8 @@ func (c *dlpServiceClient) GetDlpJob(ctx context.Context, in *GetDlpJobRequest,
 	return out, nil
 }
 
-func (c *dlpServiceClient) DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dlpServiceClient) DeleteDlpJob(ctx context.Context, in *DeleteDlpJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteDlpJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -25637,8 +25637,8 @@ func (c *dlpServiceClient) DeleteDlpJob(ctx context.Context, in *DeleteDlpJobReq
 	return out, nil
 }
 
-func (c *dlpServiceClient) CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dlpServiceClient) CancelDlpJob(ctx context.Context, in *CancelDlpJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/CancelDlpJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -25682,8 +25682,8 @@ func (c *dlpServiceClient) ListStoredInfoTypes(ctx context.Context, in *ListStor
 	return out, nil
 }
 
-func (c *dlpServiceClient) DeleteStoredInfoType(ctx context.Context, in *DeleteStoredInfoTypeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dlpServiceClient) DeleteStoredInfoType(ctx context.Context, in *DeleteStoredInfoTypeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/DeleteStoredInfoType", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -25700,8 +25700,8 @@ func (c *dlpServiceClient) HybridInspectDlpJob(ctx context.Context, in *HybridIn
 	return out, nil
 }
 
-func (c *dlpServiceClient) FinishDlpJob(ctx context.Context, in *FinishDlpJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dlpServiceClient) FinishDlpJob(ctx context.Context, in *FinishDlpJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.privacy.dlp.v2.DlpService/FinishDlpJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -25763,7 +25763,7 @@ type DlpServiceServer interface {
 	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)
+	DeleteInspectTemplate(context.Context, *DeleteInspectTemplateRequest) (*emptypb.Empty, error)
 	// Creates a DeidentifyTemplate for reusing frequently used configuration
 	// for de-identifying content, images, and storage.
 	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
@@ -25784,7 +25784,7 @@ type DlpServiceServer interface {
 	// Deletes a DeidentifyTemplate.
 	// See https://cloud.google.com/dlp/docs/creating-templates-deid to learn
 	// more.
-	DeleteDeidentifyTemplate(context.Context, *DeleteDeidentifyTemplateRequest) (*empty.Empty, error)
+	DeleteDeidentifyTemplate(context.Context, *DeleteDeidentifyTemplateRequest) (*emptypb.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.
@@ -25804,7 +25804,7 @@ type DlpServiceServer interface {
 	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)
+	DeleteJobTrigger(context.Context, *DeleteJobTriggerRequest) (*emptypb.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)
@@ -25829,13 +25829,13 @@ type DlpServiceServer interface {
 	// 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)
+	DeleteDlpJob(context.Context, *DeleteDlpJobRequest) (*emptypb.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)
+	CancelDlpJob(context.Context, *CancelDlpJobRequest) (*emptypb.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.
@@ -25856,14 +25856,14 @@ type DlpServiceServer interface {
 	// Deletes a stored infoType.
 	// See https://cloud.google.com/dlp/docs/creating-stored-infotypes to
 	// learn more.
-	DeleteStoredInfoType(context.Context, *DeleteStoredInfoTypeRequest) (*empty.Empty, error)
+	DeleteStoredInfoType(context.Context, *DeleteStoredInfoTypeRequest) (*emptypb.Empty, error)
 	// Inspect hybrid content and store findings to a job.
 	// To review the findings, inspect the job. Inspection will occur
 	// asynchronously.
 	HybridInspectDlpJob(context.Context, *HybridInspectDlpJobRequest) (*HybridInspectResponse, error)
 	// Finish a running hybrid DlpJob. Triggers the finalization steps and running
 	// of any enabled actions that have not yet run.
-	FinishDlpJob(context.Context, *FinishDlpJobRequest) (*empty.Empty, error)
+	FinishDlpJob(context.Context, *FinishDlpJobRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedDlpServiceServer can be embedded to have forward compatible implementations.
@@ -25897,7 +25897,7 @@ func (*UnimplementedDlpServiceServer) GetInspectTemplate(context.Context, *GetIn
 func (*UnimplementedDlpServiceServer) ListInspectTemplates(context.Context, *ListInspectTemplatesRequest) (*ListInspectTemplatesResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListInspectTemplates not implemented")
 }
-func (*UnimplementedDlpServiceServer) DeleteInspectTemplate(context.Context, *DeleteInspectTemplateRequest) (*empty.Empty, error) {
+func (*UnimplementedDlpServiceServer) DeleteInspectTemplate(context.Context, *DeleteInspectTemplateRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteInspectTemplate not implemented")
 }
 func (*UnimplementedDlpServiceServer) CreateDeidentifyTemplate(context.Context, *CreateDeidentifyTemplateRequest) (*DeidentifyTemplate, error) {
@@ -25912,7 +25912,7 @@ func (*UnimplementedDlpServiceServer) GetDeidentifyTemplate(context.Context, *Ge
 func (*UnimplementedDlpServiceServer) ListDeidentifyTemplates(context.Context, *ListDeidentifyTemplatesRequest) (*ListDeidentifyTemplatesResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListDeidentifyTemplates not implemented")
 }
-func (*UnimplementedDlpServiceServer) DeleteDeidentifyTemplate(context.Context, *DeleteDeidentifyTemplateRequest) (*empty.Empty, error) {
+func (*UnimplementedDlpServiceServer) DeleteDeidentifyTemplate(context.Context, *DeleteDeidentifyTemplateRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteDeidentifyTemplate not implemented")
 }
 func (*UnimplementedDlpServiceServer) CreateJobTrigger(context.Context, *CreateJobTriggerRequest) (*JobTrigger, error) {
@@ -25930,7 +25930,7 @@ func (*UnimplementedDlpServiceServer) GetJobTrigger(context.Context, *GetJobTrig
 func (*UnimplementedDlpServiceServer) ListJobTriggers(context.Context, *ListJobTriggersRequest) (*ListJobTriggersResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListJobTriggers not implemented")
 }
-func (*UnimplementedDlpServiceServer) DeleteJobTrigger(context.Context, *DeleteJobTriggerRequest) (*empty.Empty, error) {
+func (*UnimplementedDlpServiceServer) DeleteJobTrigger(context.Context, *DeleteJobTriggerRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteJobTrigger not implemented")
 }
 func (*UnimplementedDlpServiceServer) ActivateJobTrigger(context.Context, *ActivateJobTriggerRequest) (*DlpJob, error) {
@@ -25945,10 +25945,10 @@ func (*UnimplementedDlpServiceServer) ListDlpJobs(context.Context, *ListDlpJobsR
 func (*UnimplementedDlpServiceServer) GetDlpJob(context.Context, *GetDlpJobRequest) (*DlpJob, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method GetDlpJob not implemented")
 }
-func (*UnimplementedDlpServiceServer) DeleteDlpJob(context.Context, *DeleteDlpJobRequest) (*empty.Empty, error) {
+func (*UnimplementedDlpServiceServer) DeleteDlpJob(context.Context, *DeleteDlpJobRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteDlpJob not implemented")
 }
-func (*UnimplementedDlpServiceServer) CancelDlpJob(context.Context, *CancelDlpJobRequest) (*empty.Empty, error) {
+func (*UnimplementedDlpServiceServer) CancelDlpJob(context.Context, *CancelDlpJobRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method CancelDlpJob not implemented")
 }
 func (*UnimplementedDlpServiceServer) CreateStoredInfoType(context.Context, *CreateStoredInfoTypeRequest) (*StoredInfoType, error) {
@@ -25963,13 +25963,13 @@ func (*UnimplementedDlpServiceServer) GetStoredInfoType(context.Context, *GetSto
 func (*UnimplementedDlpServiceServer) ListStoredInfoTypes(context.Context, *ListStoredInfoTypesRequest) (*ListStoredInfoTypesResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListStoredInfoTypes not implemented")
 }
-func (*UnimplementedDlpServiceServer) DeleteStoredInfoType(context.Context, *DeleteStoredInfoTypeRequest) (*empty.Empty, error) {
+func (*UnimplementedDlpServiceServer) DeleteStoredInfoType(context.Context, *DeleteStoredInfoTypeRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteStoredInfoType not implemented")
 }
 func (*UnimplementedDlpServiceServer) HybridInspectDlpJob(context.Context, *HybridInspectDlpJobRequest) (*HybridInspectResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method HybridInspectDlpJob not implemented")
 }
-func (*UnimplementedDlpServiceServer) FinishDlpJob(context.Context, *FinishDlpJobRequest) (*empty.Empty, error) {
+func (*UnimplementedDlpServiceServer) FinishDlpJob(context.Context, *FinishDlpJobRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method FinishDlpJob not implemented")
 }
 
diff --git a/dlp/apiv2/dlppb/storage.pb.go b/dlp/apiv2/dlppb/storage.pb.go
index 08d26ea6a1a..bf93311b8fc 100644
--- a/dlp/apiv2/dlppb/storage.pb.go
+++ b/dlp/apiv2/dlppb/storage.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/privacy/dlp/v2/storage.proto
 
 package dlppb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -566,7 +566,7 @@ type StoredType struct {
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Timestamp indicating when the version of the `StoredInfoType` used for
 	// inspection was created. Output-only field, populated by the system.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *StoredType) Reset() {
@@ -608,7 +608,7 @@ func (x *StoredType) GetName() string {
 	return ""
 }
 
-func (x *StoredType) GetCreateTime() *timestamp.Timestamp {
+func (x *StoredType) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -2813,10 +2813,10 @@ type StorageConfig_TimespanConfig struct {
 
 	// Exclude files, tables, or rows older than this value.
 	// If not set, no lower time limit is applied.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Exclude files, tables, or rows newer than this value.
 	// If not set, no upper time limit is applied.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Specification of the field containing the timestamp of scanned items.
 	// Used for data sources like Datastore and BigQuery.
 	//
@@ -2892,14 +2892,14 @@ func (*StorageConfig_TimespanConfig) Descriptor() ([]byte, []int) {
 	return file_google_privacy_dlp_v2_storage_proto_rawDescGZIP(), []int{13, 0}
 }
 
-func (x *StorageConfig_TimespanConfig) GetStartTime() *timestamp.Timestamp {
+func (x *StorageConfig_TimespanConfig) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *StorageConfig_TimespanConfig) GetEndTime() *timestamp.Timestamp {
+func (x *StorageConfig_TimespanConfig) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -3496,7 +3496,7 @@ var file_google_privacy_dlp_v2_storage_proto_goTypes = []interface{}{
 	(*StorageConfig_TimespanConfig)(nil),                      // 38: google.privacy.dlp.v2.StorageConfig.TimespanConfig
 	nil,                                                       // 39: google.privacy.dlp.v2.HybridOptions.LabelsEntry
 	(*Key_PathElement)(nil),                                   // 40: google.privacy.dlp.v2.Key.PathElement
-	(*timestamp.Timestamp)(nil),                               // 41: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                             // 41: google.protobuf.Timestamp
 }
 var file_google_privacy_dlp_v2_storage_proto_depIdxs = []int32{
 	2,  // 0: google.privacy.dlp.v2.SensitivityScore.score:type_name -> google.privacy.dlp.v2.SensitivityScore.SensitivityScoreLevel
diff --git a/dlp/apiv2/doc.go b/dlp/apiv2/doc.go
index 2df2e53abb7..e30513e1235 100644
--- a/dlp/apiv2/doc.go
+++ b/dlp/apiv2/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &dlppb.InspectContentRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#InspectContentRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#InspectContentRequest.
 //	}
 //	resp, err := c.InspectContent(ctx, req)
 //	if err != nil {
diff --git a/dlp/go.mod b/dlp/go.mod
index 796d4c925bc..7ff46e258a2 100644
--- a/dlp/go.mod
+++ b/dlp/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/dlp
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/dlp/go.sum b/dlp/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/dlp/go.sum
+++ b/dlp/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/documentai/apiv1/doc.go b/documentai/apiv1/doc.go
index 0c05f6f72b4..c0d908fb324 100644
--- a/documentai/apiv1/doc.go
+++ b/documentai/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &documentaipb.ProcessRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ProcessRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ProcessRequest.
 //	}
 //	resp, err := c.ProcessDocument(ctx, req)
 //	if err != nil {
diff --git a/documentai/apiv1/document_processor_client.go b/documentai/apiv1/document_processor_client.go
index 1d93e1915ab..cfb36799774 100644
--- a/documentai/apiv1/document_processor_client.go
+++ b/documentai/apiv1/document_processor_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/documentai/apiv1/document_processor_client_example_test.go b/documentai/apiv1/document_processor_client_example_test.go
index e6dfa00dd6c..7c81f7a4fba 100644
--- a/documentai/apiv1/document_processor_client_example_test.go
+++ b/documentai/apiv1/document_processor_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 	"google.golang.org/api/iterator"
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleDocumentProcessorClient_ProcessDocument() {
 
 	req := &documentaipb.ProcessRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ProcessRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ProcessRequest.
 	}
 	resp, err := c.ProcessDocument(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleDocumentProcessorClient_BatchProcessDocuments() {
 
 	req := &documentaipb.BatchProcessRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#BatchProcessRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#BatchProcessRequest.
 	}
 	op, err := c.BatchProcessDocuments(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleDocumentProcessorClient_FetchProcessorTypes() {
 
 	req := &documentaipb.FetchProcessorTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#FetchProcessorTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#FetchProcessorTypesRequest.
 	}
 	resp, err := c.FetchProcessorTypes(ctx, req)
 	if err != nil {
@@ -138,7 +138,7 @@ func ExampleDocumentProcessorClient_ListProcessorTypes() {
 
 	req := &documentaipb.ListProcessorTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ListProcessorTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ListProcessorTypesRequest.
 	}
 	it := c.ListProcessorTypes(ctx, req)
 	for {
@@ -169,7 +169,7 @@ func ExampleDocumentProcessorClient_ListProcessors() {
 
 	req := &documentaipb.ListProcessorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ListProcessorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ListProcessorsRequest.
 	}
 	it := c.ListProcessors(ctx, req)
 	for {
@@ -200,7 +200,7 @@ func ExampleDocumentProcessorClient_GetProcessor() {
 
 	req := &documentaipb.GetProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#GetProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#GetProcessorRequest.
 	}
 	resp, err := c.GetProcessor(ctx, req)
 	if err != nil {
@@ -225,7 +225,7 @@ func ExampleDocumentProcessorClient_GetProcessorVersion() {
 
 	req := &documentaipb.GetProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#GetProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#GetProcessorVersionRequest.
 	}
 	resp, err := c.GetProcessorVersion(ctx, req)
 	if err != nil {
@@ -250,7 +250,7 @@ func ExampleDocumentProcessorClient_ListProcessorVersions() {
 
 	req := &documentaipb.ListProcessorVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ListProcessorVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ListProcessorVersionsRequest.
 	}
 	it := c.ListProcessorVersions(ctx, req)
 	for {
@@ -281,7 +281,7 @@ func ExampleDocumentProcessorClient_DeleteProcessorVersion() {
 
 	req := &documentaipb.DeleteProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#DeleteProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#DeleteProcessorVersionRequest.
 	}
 	op, err := c.DeleteProcessorVersion(ctx, req)
 	if err != nil {
@@ -309,7 +309,7 @@ func ExampleDocumentProcessorClient_DeployProcessorVersion() {
 
 	req := &documentaipb.DeployProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#DeployProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#DeployProcessorVersionRequest.
 	}
 	op, err := c.DeployProcessorVersion(ctx, req)
 	if err != nil {
@@ -339,7 +339,7 @@ func ExampleDocumentProcessorClient_UndeployProcessorVersion() {
 
 	req := &documentaipb.UndeployProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#UndeployProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#UndeployProcessorVersionRequest.
 	}
 	op, err := c.UndeployProcessorVersion(ctx, req)
 	if err != nil {
@@ -369,7 +369,7 @@ func ExampleDocumentProcessorClient_CreateProcessor() {
 
 	req := &documentaipb.CreateProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#CreateProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#CreateProcessorRequest.
 	}
 	resp, err := c.CreateProcessor(ctx, req)
 	if err != nil {
@@ -394,7 +394,7 @@ func ExampleDocumentProcessorClient_DeleteProcessor() {
 
 	req := &documentaipb.DeleteProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#DeleteProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#DeleteProcessorRequest.
 	}
 	op, err := c.DeleteProcessor(ctx, req)
 	if err != nil {
@@ -422,7 +422,7 @@ func ExampleDocumentProcessorClient_EnableProcessor() {
 
 	req := &documentaipb.EnableProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#EnableProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#EnableProcessorRequest.
 	}
 	op, err := c.EnableProcessor(ctx, req)
 	if err != nil {
@@ -452,7 +452,7 @@ func ExampleDocumentProcessorClient_DisableProcessor() {
 
 	req := &documentaipb.DisableProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#DisableProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#DisableProcessorRequest.
 	}
 	op, err := c.DisableProcessor(ctx, req)
 	if err != nil {
@@ -482,7 +482,7 @@ func ExampleDocumentProcessorClient_SetDefaultProcessorVersion() {
 
 	req := &documentaipb.SetDefaultProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#SetDefaultProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#SetDefaultProcessorVersionRequest.
 	}
 	op, err := c.SetDefaultProcessorVersion(ctx, req)
 	if err != nil {
@@ -512,7 +512,7 @@ func ExampleDocumentProcessorClient_ReviewDocument() {
 
 	req := &documentaipb.ReviewDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ReviewDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ReviewDocumentRequest.
 	}
 	op, err := c.ReviewDocument(ctx, req)
 	if err != nil {
diff --git a/documentai/apiv1/documentaipb/barcode.pb.go b/documentai/apiv1/documentaipb/barcode.pb.go
index 8e5c0aa845c..9a01bf19d73 100644
--- a/documentai/apiv1/documentaipb/barcode.pb.go
+++ b/documentai/apiv1/documentaipb/barcode.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/barcode.proto
 
 package documentaipb
diff --git a/documentai/apiv1/documentaipb/document.pb.go b/documentai/apiv1/documentaipb/document.pb.go
index 4fe6e452dc8..1f280a0a4e6 100644
--- a/documentai/apiv1/documentaipb/document.pb.go
+++ b/documentai/apiv1/documentaipb/document.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/document.proto
 
 package documentaipb
@@ -24,7 +24,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	color "google.golang.org/genproto/googleapis/type/color"
@@ -34,6 +33,7 @@ import (
 	postaladdress "google.golang.org/genproto/googleapis/type/postaladdress"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1306,7 +1306,7 @@ type Document_Revision struct {
 	// `provenance.parent.revision` fields that index into this field.
 	ParentIds []string `protobuf:"bytes,7,rep,name=parent_ids,json=parentIds,proto3" json:"parent_ids,omitempty"`
 	// The time that the revision was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Human Review information of this revision.
 	HumanReview *Document_Revision_HumanReview `protobuf:"bytes,6,opt,name=human_review,json=humanReview,proto3" json:"human_review,omitempty"`
 }
@@ -1386,7 +1386,7 @@ func (x *Document_Revision) GetParentIds() []string {
 	return nil
 }
 
-func (x *Document_Revision) GetCreateTime() *timestamp.Timestamp {
+func (x *Document_Revision) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -3917,7 +3917,7 @@ var file_google_cloud_documentai_v1_document_proto_goTypes = []interface{}{
 	(*Document_Revision_HumanReview)(nil),       // 37: google.cloud.documentai.v1.Document.Revision.HumanReview
 	(*status.Status)(nil),                       // 38: google.rpc.Status
 	(*color.Color)(nil),                         // 39: google.type.Color
-	(*timestamp.Timestamp)(nil),                 // 40: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),               // 40: google.protobuf.Timestamp
 	(*BoundingPoly)(nil),                        // 41: google.cloud.documentai.v1.BoundingPoly
 	(*Barcode)(nil),                             // 42: google.cloud.documentai.v1.Barcode
 	(*money.Money)(nil),                         // 43: google.type.Money
diff --git a/documentai/apiv1/documentaipb/document_io.pb.go b/documentai/apiv1/documentaipb/document_io.pb.go
index 229895ff749..d7fd862715a 100644
--- a/documentai/apiv1/documentaipb/document_io.pb.go
+++ b/documentai/apiv1/documentaipb/document_io.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/document_io.proto
 
 package documentaipb
diff --git a/documentai/apiv1/documentaipb/document_processor_service.pb.go b/documentai/apiv1/documentaipb/document_processor_service.pb.go
index 364fe214ada..8a93220b769 100644
--- a/documentai/apiv1/documentaipb/document_processor_service.pb.go
+++ b/documentai/apiv1/documentaipb/document_processor_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/document_processor_service.proto
 
 package documentaipb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -304,7 +304,7 @@ type ProcessRequest struct {
 	// false.
 	SkipHumanReview bool `protobuf:"varint,3,opt,name=skip_human_review,json=skipHumanReview,proto3" json:"skip_human_review,omitempty"`
 	// Specifies which fields to include in ProcessResponse's document.
-	FieldMask *field_mask.FieldMask `protobuf:"bytes,6,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
+	FieldMask *fieldmaskpb.FieldMask `protobuf:"bytes,6,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
 }
 
 func (x *ProcessRequest) Reset() {
@@ -374,7 +374,7 @@ func (x *ProcessRequest) GetSkipHumanReview() bool {
 	return false
 }
 
-func (x *ProcessRequest) GetFieldMask() *field_mask.FieldMask {
+func (x *ProcessRequest) GetFieldMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.FieldMask
 	}
@@ -660,9 +660,9 @@ type BatchProcessMetadata struct {
 	// For example, the error message if the operation is failed.
 	StateMessage string `protobuf:"bytes,2,opt,name=state_message,json=stateMessage,proto3" json:"state_message,omitempty"`
 	// The creation time of the operation.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The last update time of the operation.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The list of response details of each document.
 	IndividualProcessStatuses []*BatchProcessMetadata_IndividualProcessStatus `protobuf:"bytes,5,rep,name=individual_process_statuses,json=individualProcessStatuses,proto3" json:"individual_process_statuses,omitempty"`
 }
@@ -713,14 +713,14 @@ func (x *BatchProcessMetadata) GetStateMessage() string {
 	return ""
 }
 
-func (x *BatchProcessMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *BatchProcessMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *BatchProcessMetadata) GetUpdateTime() *timestamp.Timestamp {
+func (x *BatchProcessMetadata) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -3371,10 +3371,10 @@ var file_google_cloud_documentai_v1_document_processor_service_proto_goTypes = [
 	(*BatchProcessMetadata_IndividualProcessStatus)(nil), // 43: google.cloud.documentai.v1.BatchProcessMetadata.IndividualProcessStatus
 	(*Document)(nil),                                     // 44: google.cloud.documentai.v1.Document
 	(*RawDocument)(nil),                                  // 45: google.cloud.documentai.v1.RawDocument
-	(*field_mask.FieldMask)(nil),                         // 46: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                        // 46: google.protobuf.FieldMask
 	(*BatchDocumentsInputConfig)(nil),                    // 47: google.cloud.documentai.v1.BatchDocumentsInputConfig
 	(*DocumentOutputConfig)(nil),                         // 48: google.cloud.documentai.v1.DocumentOutputConfig
-	(*timestamp.Timestamp)(nil),                          // 49: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                        // 49: google.protobuf.Timestamp
 	(*ProcessorType)(nil),                                // 50: google.cloud.documentai.v1.ProcessorType
 	(*Processor)(nil),                                    // 51: google.cloud.documentai.v1.Processor
 	(*ProcessorVersion)(nil),                             // 52: google.cloud.documentai.v1.ProcessorVersion
diff --git a/documentai/apiv1/documentaipb/document_schema.pb.go b/documentai/apiv1/documentaipb/document_schema.pb.go
index c49874f9fd5..cc096ba2a9a 100644
--- a/documentai/apiv1/documentaipb/document_schema.pb.go
+++ b/documentai/apiv1/documentaipb/document_schema.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/document_schema.proto
 
 package documentaipb
diff --git a/documentai/apiv1/documentaipb/geometry.pb.go b/documentai/apiv1/documentaipb/geometry.pb.go
index 6308b28103a..b4acca1010d 100644
--- a/documentai/apiv1/documentaipb/geometry.pb.go
+++ b/documentai/apiv1/documentaipb/geometry.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/geometry.proto
 
 package documentaipb
diff --git a/documentai/apiv1/documentaipb/operation_metadata.pb.go b/documentai/apiv1/documentaipb/operation_metadata.pb.go
index 3b0ee6be287..fbb8176206f 100644
--- a/documentai/apiv1/documentaipb/operation_metadata.pb.go
+++ b/documentai/apiv1/documentaipb/operation_metadata.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/operation_metadata.proto
 
 package documentaipb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -114,9 +114,9 @@ type CommonOperationMetadata struct {
 	// A related resource to this operation.
 	Resource string `protobuf:"bytes,5,opt,name=resource,proto3" json:"resource,omitempty"`
 	// The creation time of the operation.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The last update time of the operation.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *CommonOperationMetadata) Reset() {
@@ -172,14 +172,14 @@ func (x *CommonOperationMetadata) GetResource() string {
 	return ""
 }
 
-func (x *CommonOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *CommonOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CommonOperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+func (x *CommonOperationMetadata) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -255,7 +255,7 @@ var file_google_cloud_documentai_v1_operation_metadata_proto_msgTypes = make([]p
 var file_google_cloud_documentai_v1_operation_metadata_proto_goTypes = []interface{}{
 	(CommonOperationMetadata_State)(0), // 0: google.cloud.documentai.v1.CommonOperationMetadata.State
 	(*CommonOperationMetadata)(nil),    // 1: google.cloud.documentai.v1.CommonOperationMetadata
-	(*timestamp.Timestamp)(nil),        // 2: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),      // 2: google.protobuf.Timestamp
 }
 var file_google_cloud_documentai_v1_operation_metadata_proto_depIdxs = []int32{
 	0, // 0: google.cloud.documentai.v1.CommonOperationMetadata.state:type_name -> google.cloud.documentai.v1.CommonOperationMetadata.State
diff --git a/documentai/apiv1/documentaipb/processor.pb.go b/documentai/apiv1/documentaipb/processor.pb.go
index 80dc9c3027e..bd85e2d75d3 100644
--- a/documentai/apiv1/documentaipb/processor.pb.go
+++ b/documentai/apiv1/documentaipb/processor.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/processor.proto
 
 package documentaipb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -210,7 +210,7 @@ type ProcessorVersion struct {
 	// The state of the processor version.
 	State ProcessorVersion_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.cloud.documentai.v1.ProcessorVersion_State" json:"state,omitempty"`
 	// The time the processor version was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The KMS key name used for encryption.
 	KmsKeyName string `protobuf:"bytes,9,opt,name=kms_key_name,json=kmsKeyName,proto3" json:"kms_key_name,omitempty"`
 	// The KMS key version with which data is encrypted.
@@ -274,7 +274,7 @@ func (x *ProcessorVersion) GetState() ProcessorVersion_State {
 	return ProcessorVersion_STATE_UNSPECIFIED
 }
 
-func (x *ProcessorVersion) GetCreateTime() *timestamp.Timestamp {
+func (x *ProcessorVersion) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -332,7 +332,7 @@ type Processor struct {
 	// Output only. Immutable. The http endpoint that can be called to invoke processing.
 	ProcessEndpoint string `protobuf:"bytes,6,opt,name=process_endpoint,json=processEndpoint,proto3" json:"process_endpoint,omitempty"`
 	// The time the processor was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The KMS key used for encryption/decryption in CMEK scenarios.
 	// See https://cloud.google.com/security-key-management.
 	KmsKeyName string `protobuf:"bytes,8,opt,name=kms_key_name,json=kmsKeyName,proto3" json:"kms_key_name,omitempty"`
@@ -412,7 +412,7 @@ func (x *Processor) GetProcessEndpoint() string {
 	return ""
 }
 
-func (x *Processor) GetCreateTime() *timestamp.Timestamp {
+func (x *Processor) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -433,7 +433,7 @@ type ProcessorVersion_DeprecationInfo struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time at which this processor version will be deprecated.
-	DeprecationTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=deprecation_time,json=deprecationTime,proto3" json:"deprecation_time,omitempty"`
+	DeprecationTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=deprecation_time,json=deprecationTime,proto3" json:"deprecation_time,omitempty"`
 	// If set, the processor version that will be used as a replacement.
 	ReplacementProcessorVersion string `protobuf:"bytes,2,opt,name=replacement_processor_version,json=replacementProcessorVersion,proto3" json:"replacement_processor_version,omitempty"`
 }
@@ -470,7 +470,7 @@ func (*ProcessorVersion_DeprecationInfo) Descriptor() ([]byte, []int) {
 	return file_google_cloud_documentai_v1_processor_proto_rawDescGZIP(), []int{0, 0}
 }
 
-func (x *ProcessorVersion_DeprecationInfo) GetDeprecationTime() *timestamp.Timestamp {
+func (x *ProcessorVersion_DeprecationInfo) GetDeprecationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeprecationTime
 	}
@@ -633,7 +633,7 @@ var file_google_cloud_documentai_v1_processor_proto_goTypes = []interface{}{
 	(*ProcessorVersion)(nil),                 // 2: google.cloud.documentai.v1.ProcessorVersion
 	(*Processor)(nil),                        // 3: google.cloud.documentai.v1.Processor
 	(*ProcessorVersion_DeprecationInfo)(nil), // 4: google.cloud.documentai.v1.ProcessorVersion.DeprecationInfo
-	(*timestamp.Timestamp)(nil),              // 5: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),            // 5: google.protobuf.Timestamp
 }
 var file_google_cloud_documentai_v1_processor_proto_depIdxs = []int32{
 	0, // 0: google.cloud.documentai.v1.ProcessorVersion.state:type_name -> google.cloud.documentai.v1.ProcessorVersion.State
diff --git a/documentai/apiv1/documentaipb/processor_type.pb.go b/documentai/apiv1/documentaipb/processor_type.pb.go
index ec054b0ec38..7dedf66e76e 100644
--- a/documentai/apiv1/documentaipb/processor_type.pb.go
+++ b/documentai/apiv1/documentaipb/processor_type.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/documentai/v1/processor_type.proto
 
 package documentaipb
diff --git a/documentai/go.mod b/documentai/go.mod
index 7872cb1e225..e1c24dc4f47 100644
--- a/documentai/go.mod
+++ b/documentai/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/documentai
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/documentai/go.sum b/documentai/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/documentai/go.sum
+++ b/documentai/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/essentialcontacts/aliasshim/aliasshim.go b/essentialcontacts/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/essentialcontacts/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/essentialcontacts/apiv1/doc.go b/essentialcontacts/apiv1/doc.go
index 35278ba9e78..e3aa3d24a2f 100644
--- a/essentialcontacts/apiv1/doc.go
+++ b/essentialcontacts/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &essentialcontactspb.CreateContactRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#CreateContactRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#CreateContactRequest.
 //	}
 //	resp, err := c.CreateContact(ctx, req)
 //	if err != nil {
diff --git a/essentialcontacts/apiv1/essential_contacts_client.go b/essentialcontacts/apiv1/essential_contacts_client.go
index dd8ae3e534e..ffed6a3f1dc 100644
--- a/essentialcontacts/apiv1/essential_contacts_client.go
+++ b/essentialcontacts/apiv1/essential_contacts_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/essentialcontacts/apiv1/essential_contacts_client_example_test.go b/essentialcontacts/apiv1/essential_contacts_client_example_test.go
index 24a380fe851..765233c0be0 100644
--- a/essentialcontacts/apiv1/essential_contacts_client_example_test.go
+++ b/essentialcontacts/apiv1/essential_contacts_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	essentialcontacts "cloud.google.com/go/essentialcontacts/apiv1"
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 	"google.golang.org/api/iterator"
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_CreateContact() {
 
 	req := &essentialcontactspb.CreateContactRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#CreateContactRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#CreateContactRequest.
 	}
 	resp, err := c.CreateContact(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_UpdateContact() {
 
 	req := &essentialcontactspb.UpdateContactRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#UpdateContactRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#UpdateContactRequest.
 	}
 	resp, err := c.UpdateContact(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleClient_ListContacts() {
 
 	req := &essentialcontactspb.ListContactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#ListContactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#ListContactsRequest.
 	}
 	it := c.ListContacts(ctx, req)
 	for {
@@ -137,7 +137,7 @@ func ExampleClient_GetContact() {
 
 	req := &essentialcontactspb.GetContactRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#GetContactRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#GetContactRequest.
 	}
 	resp, err := c.GetContact(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleClient_DeleteContact() {
 
 	req := &essentialcontactspb.DeleteContactRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#DeleteContactRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#DeleteContactRequest.
 	}
 	err = c.DeleteContact(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleClient_ComputeContacts() {
 
 	req := &essentialcontactspb.ComputeContactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#ComputeContactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#ComputeContactsRequest.
 	}
 	it := c.ComputeContacts(ctx, req)
 	for {
@@ -216,7 +216,7 @@ func ExampleClient_SendTestMessage() {
 
 	req := &essentialcontactspb.SendTestMessageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#SendTestMessageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#SendTestMessageRequest.
 	}
 	err = c.SendTestMessage(ctx, req)
 	if err != nil {
diff --git a/essentialcontacts/apiv1/essentialcontactspb/enums.pb.go b/essentialcontacts/apiv1/essentialcontactspb/enums.pb.go
index d6157cb3370..c0b7f28bfd7 100644
--- a/essentialcontacts/apiv1/essentialcontactspb/enums.pb.go
+++ b/essentialcontacts/apiv1/essentialcontactspb/enums.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/essentialcontacts/v1/enums.proto
 
 package essentialcontactspb
diff --git a/essentialcontacts/apiv1/essentialcontactspb/service.pb.go b/essentialcontacts/apiv1/essentialcontactspb/service.pb.go
index 29d5cf2bace..4942dae2b2a 100644
--- a/essentialcontacts/apiv1/essentialcontactspb/service.pb.go
+++ b/essentialcontacts/apiv1/essentialcontactspb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/essentialcontacts/v1/service.proto
 
 package essentialcontactspb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -69,7 +69,7 @@ type Contact struct {
 	// The last time the validation_state was updated, either manually or
 	// automatically. A contact is considered stale if its validation state was
 	// updated more than 1 year ago.
-	ValidateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=validate_time,json=validateTime,proto3" json:"validate_time,omitempty"`
+	ValidateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=validate_time,json=validateTime,proto3" json:"validate_time,omitempty"`
 }
 
 func (x *Contact) Reset() {
@@ -139,7 +139,7 @@ func (x *Contact) GetValidationState() ValidationState {
 	return ValidationState_VALIDATION_STATE_UNSPECIFIED
 }
 
-func (x *Contact) GetValidateTime() *timestamp.Timestamp {
+func (x *Contact) GetValidateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ValidateTime
 	}
@@ -459,7 +459,7 @@ type UpdateContactRequest struct {
 	// Optional. The update mask applied to the resource. For the `FieldMask`
 	// definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateContactRequest) Reset() {
@@ -501,7 +501,7 @@ func (x *UpdateContactRequest) GetContact() *Contact {
 	return nil
 }
 
-func (x *UpdateContactRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateContactRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1057,9 +1057,9 @@ var file_google_cloud_essentialcontacts_v1_service_proto_goTypes = []interface{}
 	(*SendTestMessageRequest)(nil),  // 9: google.cloud.essentialcontacts.v1.SendTestMessageRequest
 	(NotificationCategory)(0),       // 10: google.cloud.essentialcontacts.v1.NotificationCategory
 	(ValidationState)(0),            // 11: google.cloud.essentialcontacts.v1.ValidationState
-	(*timestamp.Timestamp)(nil),     // 12: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),    // 13: google.protobuf.FieldMask
-	(*empty.Empty)(nil),             // 14: google.protobuf.Empty
+	(*timestamppb.Timestamp)(nil),   // 12: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),   // 13: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),           // 14: google.protobuf.Empty
 }
 var file_google_cloud_essentialcontacts_v1_service_proto_depIdxs = []int32{
 	10, // 0: google.cloud.essentialcontacts.v1.Contact.notification_category_subscriptions:type_name -> google.cloud.essentialcontacts.v1.NotificationCategory
@@ -1263,14 +1263,14 @@ type EssentialContactsServiceClient interface {
 	// Gets a single contact.
 	GetContact(ctx context.Context, in *GetContactRequest, opts ...grpc.CallOption) (*Contact, error)
 	// Deletes a contact.
-	DeleteContact(ctx context.Context, in *DeleteContactRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteContact(ctx context.Context, in *DeleteContactRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists all contacts for the resource that are subscribed to the
 	// specified notification categories, including contacts inherited from
 	// any parent resources.
 	ComputeContacts(ctx context.Context, in *ComputeContactsRequest, opts ...grpc.CallOption) (*ComputeContactsResponse, error)
 	// Allows a contact admin to send a test message to contact to verify that it
 	// has been configured correctly.
-	SendTestMessage(ctx context.Context, in *SendTestMessageRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	SendTestMessage(ctx context.Context, in *SendTestMessageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type essentialContactsServiceClient struct {
@@ -1317,8 +1317,8 @@ func (c *essentialContactsServiceClient) GetContact(ctx context.Context, in *Get
 	return out, nil
 }
 
-func (c *essentialContactsServiceClient) DeleteContact(ctx context.Context, in *DeleteContactRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *essentialContactsServiceClient) DeleteContact(ctx context.Context, in *DeleteContactRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.essentialcontacts.v1.EssentialContactsService/DeleteContact", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1335,8 +1335,8 @@ func (c *essentialContactsServiceClient) ComputeContacts(ctx context.Context, in
 	return out, nil
 }
 
-func (c *essentialContactsServiceClient) SendTestMessage(ctx context.Context, in *SendTestMessageRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *essentialContactsServiceClient) SendTestMessage(ctx context.Context, in *SendTestMessageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.essentialcontacts.v1.EssentialContactsService/SendTestMessage", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1356,14 +1356,14 @@ type EssentialContactsServiceServer interface {
 	// Gets a single contact.
 	GetContact(context.Context, *GetContactRequest) (*Contact, error)
 	// Deletes a contact.
-	DeleteContact(context.Context, *DeleteContactRequest) (*empty.Empty, error)
+	DeleteContact(context.Context, *DeleteContactRequest) (*emptypb.Empty, error)
 	// Lists all contacts for the resource that are subscribed to the
 	// specified notification categories, including contacts inherited from
 	// any parent resources.
 	ComputeContacts(context.Context, *ComputeContactsRequest) (*ComputeContactsResponse, error)
 	// Allows a contact admin to send a test message to contact to verify that it
 	// has been configured correctly.
-	SendTestMessage(context.Context, *SendTestMessageRequest) (*empty.Empty, error)
+	SendTestMessage(context.Context, *SendTestMessageRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedEssentialContactsServiceServer can be embedded to have forward compatible implementations.
@@ -1382,13 +1382,13 @@ func (*UnimplementedEssentialContactsServiceServer) ListContacts(context.Context
 func (*UnimplementedEssentialContactsServiceServer) GetContact(context.Context, *GetContactRequest) (*Contact, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetContact not implemented")
 }
-func (*UnimplementedEssentialContactsServiceServer) DeleteContact(context.Context, *DeleteContactRequest) (*empty.Empty, error) {
+func (*UnimplementedEssentialContactsServiceServer) DeleteContact(context.Context, *DeleteContactRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteContact not implemented")
 }
 func (*UnimplementedEssentialContactsServiceServer) ComputeContacts(context.Context, *ComputeContactsRequest) (*ComputeContactsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ComputeContacts not implemented")
 }
-func (*UnimplementedEssentialContactsServiceServer) SendTestMessage(context.Context, *SendTestMessageRequest) (*empty.Empty, error) {
+func (*UnimplementedEssentialContactsServiceServer) SendTestMessage(context.Context, *SendTestMessageRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendTestMessage not implemented")
 }
 
diff --git a/essentialcontacts/go.mod b/essentialcontacts/go.mod
index cbd2a777f7c..92d62acac43 100644
--- a/essentialcontacts/go.mod
+++ b/essentialcontacts/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/essentialcontacts
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/essentialcontacts/go.sum b/essentialcontacts/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/essentialcontacts/go.sum
+++ b/essentialcontacts/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/eventarc/aliasshim/aliasshim.go b/eventarc/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/eventarc/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/eventarc/apiv1/doc.go b/eventarc/apiv1/doc.go
index 08188387d70..2103ce64591 100644
--- a/eventarc/apiv1/doc.go
+++ b/eventarc/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &eventarcpb.GetTriggerRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetTriggerRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetTriggerRequest.
 //	}
 //	resp, err := c.GetTrigger(ctx, req)
 //	if err != nil {
diff --git a/eventarc/apiv1/eventarc_client.go b/eventarc/apiv1/eventarc_client.go
index 670b17a9bb3..36940a1f0f6 100644
--- a/eventarc/apiv1/eventarc_client.go
+++ b/eventarc/apiv1/eventarc_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/eventarc/apiv1/eventarc_client_example_test.go b/eventarc/apiv1/eventarc_client_example_test.go
index 60131ef050b..d438d8534cf 100644
--- a/eventarc/apiv1/eventarc_client_example_test.go
+++ b/eventarc/apiv1/eventarc_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 	"google.golang.org/api/iterator"
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_GetTrigger() {
 
 	req := &eventarcpb.GetTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetTriggerRequest.
 	}
 	resp, err := c.GetTrigger(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_ListTriggers() {
 
 	req := &eventarcpb.ListTriggersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#ListTriggersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#ListTriggersRequest.
 	}
 	it := c.ListTriggers(ctx, req)
 	for {
@@ -112,7 +112,7 @@ func ExampleClient_CreateTrigger() {
 
 	req := &eventarcpb.CreateTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#CreateTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#CreateTriggerRequest.
 	}
 	op, err := c.CreateTrigger(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleClient_UpdateTrigger() {
 
 	req := &eventarcpb.UpdateTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#UpdateTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#UpdateTriggerRequest.
 	}
 	op, err := c.UpdateTrigger(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleClient_DeleteTrigger() {
 
 	req := &eventarcpb.DeleteTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#DeleteTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#DeleteTriggerRequest.
 	}
 	op, err := c.DeleteTrigger(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleClient_GetChannel() {
 
 	req := &eventarcpb.GetChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetChannelRequest.
 	}
 	resp, err := c.GetChannel(ctx, req)
 	if err != nil {
@@ -227,7 +227,7 @@ func ExampleClient_ListChannels() {
 
 	req := &eventarcpb.ListChannelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#ListChannelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#ListChannelsRequest.
 	}
 	it := c.ListChannels(ctx, req)
 	for {
@@ -258,7 +258,7 @@ func ExampleClient_CreateChannel() {
 
 	req := &eventarcpb.CreateChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#CreateChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#CreateChannelRequest.
 	}
 	op, err := c.CreateChannel(ctx, req)
 	if err != nil {
@@ -288,7 +288,7 @@ func ExampleClient_UpdateChannel() {
 
 	req := &eventarcpb.UpdateChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#UpdateChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#UpdateChannelRequest.
 	}
 	op, err := c.UpdateChannel(ctx, req)
 	if err != nil {
@@ -318,7 +318,7 @@ func ExampleClient_DeleteChannel() {
 
 	req := &eventarcpb.DeleteChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#DeleteChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#DeleteChannelRequest.
 	}
 	op, err := c.DeleteChannel(ctx, req)
 	if err != nil {
@@ -348,7 +348,7 @@ func ExampleClient_GetProvider() {
 
 	req := &eventarcpb.GetProviderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetProviderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetProviderRequest.
 	}
 	resp, err := c.GetProvider(ctx, req)
 	if err != nil {
@@ -373,7 +373,7 @@ func ExampleClient_ListProviders() {
 
 	req := &eventarcpb.ListProvidersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#ListProvidersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#ListProvidersRequest.
 	}
 	it := c.ListProviders(ctx, req)
 	for {
@@ -404,7 +404,7 @@ func ExampleClient_GetChannelConnection() {
 
 	req := &eventarcpb.GetChannelConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetChannelConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetChannelConnectionRequest.
 	}
 	resp, err := c.GetChannelConnection(ctx, req)
 	if err != nil {
@@ -429,7 +429,7 @@ func ExampleClient_ListChannelConnections() {
 
 	req := &eventarcpb.ListChannelConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#ListChannelConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#ListChannelConnectionsRequest.
 	}
 	it := c.ListChannelConnections(ctx, req)
 	for {
@@ -460,7 +460,7 @@ func ExampleClient_CreateChannelConnection() {
 
 	req := &eventarcpb.CreateChannelConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#CreateChannelConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#CreateChannelConnectionRequest.
 	}
 	op, err := c.CreateChannelConnection(ctx, req)
 	if err != nil {
@@ -490,7 +490,7 @@ func ExampleClient_DeleteChannelConnection() {
 
 	req := &eventarcpb.DeleteChannelConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#DeleteChannelConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#DeleteChannelConnectionRequest.
 	}
 	op, err := c.DeleteChannelConnection(ctx, req)
 	if err != nil {
diff --git a/eventarc/apiv1/eventarcpb/channel.pb.go b/eventarc/apiv1/eventarcpb/channel.pb.go
index b413934daff..31e42b50838 100644
--- a/eventarc/apiv1/eventarcpb/channel.pb.go
+++ b/eventarc/apiv1/eventarcpb/channel.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/eventarc/v1/channel.proto
 
 package eventarcpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -123,9 +123,9 @@ type Channel struct {
 	// string and guaranteed to remain unchanged until the resource is deleted.
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Required. The name of the event provider (e.g. Eventarc SaaS partner) associated
 	// with the channel. This provider will be granted permissions to publish
 	// events to the channel. Format:
@@ -188,14 +188,14 @@ func (x *Channel) GetUid() string {
 	return ""
 }
 
-func (x *Channel) GetCreateTime() *timestamp.Timestamp {
+func (x *Channel) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Channel) GetUpdateTime() *timestamp.Timestamp {
+func (x *Channel) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -330,9 +330,9 @@ func file_google_cloud_eventarc_v1_channel_proto_rawDescGZIP() []byte {
 var file_google_cloud_eventarc_v1_channel_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_eventarc_v1_channel_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_eventarc_v1_channel_proto_goTypes = []interface{}{
-	(Channel_State)(0),          // 0: google.cloud.eventarc.v1.Channel.State
-	(*Channel)(nil),             // 1: google.cloud.eventarc.v1.Channel
-	(*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp
+	(Channel_State)(0),            // 0: google.cloud.eventarc.v1.Channel.State
+	(*Channel)(nil),               // 1: google.cloud.eventarc.v1.Channel
+	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
 }
 var file_google_cloud_eventarc_v1_channel_proto_depIdxs = []int32{
 	2, // 0: google.cloud.eventarc.v1.Channel.create_time:type_name -> google.protobuf.Timestamp
diff --git a/eventarc/apiv1/eventarcpb/channel_connection.pb.go b/eventarc/apiv1/eventarcpb/channel_connection.pb.go
index cfbece5df80..9d448dbc265 100644
--- a/eventarc/apiv1/eventarcpb/channel_connection.pb.go
+++ b/eventarc/apiv1/eventarcpb/channel_connection.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/eventarc/v1/channel_connection.proto
 
 package eventarcpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -57,9 +57,9 @@ type ChannelConnection struct {
 	// `projects/{project}/location/{location}/channels/{channel_id}` format.
 	Channel string `protobuf:"bytes,5,opt,name=channel,proto3" json:"channel,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Input only. Activation token for the channel. The token will be used
 	// during the creation of ChannelConnection to bind the channel with the
 	// provider project. This field will not be stored in the provider resource.
@@ -119,14 +119,14 @@ func (x *ChannelConnection) GetChannel() string {
 	return ""
 }
 
-func (x *ChannelConnection) GetCreateTime() *timestamp.Timestamp {
+func (x *ChannelConnection) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ChannelConnection) GetUpdateTime() *timestamp.Timestamp {
+func (x *ChannelConnection) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -214,8 +214,8 @@ func file_google_cloud_eventarc_v1_channel_connection_proto_rawDescGZIP() []byte
 
 var file_google_cloud_eventarc_v1_channel_connection_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_eventarc_v1_channel_connection_proto_goTypes = []interface{}{
-	(*ChannelConnection)(nil),   // 0: google.cloud.eventarc.v1.ChannelConnection
-	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+	(*ChannelConnection)(nil),     // 0: google.cloud.eventarc.v1.ChannelConnection
+	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 }
 var file_google_cloud_eventarc_v1_channel_connection_proto_depIdxs = []int32{
 	1, // 0: google.cloud.eventarc.v1.ChannelConnection.create_time:type_name -> google.protobuf.Timestamp
diff --git a/eventarc/apiv1/eventarcpb/discovery.pb.go b/eventarc/apiv1/eventarcpb/discovery.pb.go
index 4fa3f347d19..aa4096a76d1 100644
--- a/eventarc/apiv1/eventarcpb/discovery.pb.go
+++ b/eventarc/apiv1/eventarcpb/discovery.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/eventarc/v1/discovery.proto
 
 package eventarcpb
diff --git a/eventarc/apiv1/eventarcpb/eventarc.pb.go b/eventarc/apiv1/eventarcpb/eventarc.pb.go
index 8f2192aef36..add5a45508f 100644
--- a/eventarc/apiv1/eventarcpb/eventarc.pb.go
+++ b/eventarc/apiv1/eventarcpb/eventarc.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/eventarc/v1/eventarc.proto
 
 package eventarcpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -332,7 +332,7 @@ type UpdateTriggerRequest struct {
 	// The fields to be updated; only fields explicitly provided are updated.
 	// If no field mask is provided, all provided fields in the request are
 	// updated. To update all fields, provide a field mask of "*".
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// If set to true, and the trigger is not found, a new trigger will be
 	// created. In this situation, `update_mask` is ignored.
 	AllowMissing bool `protobuf:"varint,3,opt,name=allow_missing,json=allowMissing,proto3" json:"allow_missing,omitempty"`
@@ -380,7 +380,7 @@ func (x *UpdateTriggerRequest) GetTrigger() *Trigger {
 	return nil
 }
 
-func (x *UpdateTriggerRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTriggerRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -769,7 +769,7 @@ type UpdateChannelRequest struct {
 	// The fields to be updated; only fields explicitly provided are updated.
 	// If no field mask is provided, all provided fields in the request are
 	// updated. To update all fields, provide a field mask of "*".
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. If set, validate the request and preview the review, but do not
 	// post it.
 	ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
@@ -814,7 +814,7 @@ func (x *UpdateChannelRequest) GetChannel() *Channel {
 	return nil
 }
 
-func (x *UpdateChannelRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateChannelRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1410,9 +1410,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -1460,14 +1460,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_eventarc_v1_eventarc_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2029,11 +2029,11 @@ var file_google_cloud_eventarc_v1_eventarc_proto_goTypes = []interface{}{
 	(*DeleteChannelConnectionRequest)(nil), // 19: google.cloud.eventarc.v1.DeleteChannelConnectionRequest
 	(*OperationMetadata)(nil),              // 20: google.cloud.eventarc.v1.OperationMetadata
 	(*Trigger)(nil),                        // 21: google.cloud.eventarc.v1.Trigger
-	(*field_mask.FieldMask)(nil),           // 22: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),          // 22: google.protobuf.FieldMask
 	(*Channel)(nil),                        // 23: google.cloud.eventarc.v1.Channel
 	(*Provider)(nil),                       // 24: google.cloud.eventarc.v1.Provider
 	(*ChannelConnection)(nil),              // 25: google.cloud.eventarc.v1.ChannelConnection
-	(*timestamp.Timestamp)(nil),            // 26: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 26: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),          // 27: google.longrunning.Operation
 }
 var file_google_cloud_eventarc_v1_eventarc_proto_depIdxs = []int32{
diff --git a/eventarc/apiv1/eventarcpb/trigger.pb.go b/eventarc/apiv1/eventarcpb/trigger.pb.go
index ed36f9958cf..4e3ec592f8e 100644
--- a/eventarc/apiv1/eventarcpb/trigger.pb.go
+++ b/eventarc/apiv1/eventarcpb/trigger.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/eventarc/v1/trigger.proto
 
 package eventarcpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -51,9 +51,9 @@ type Trigger struct {
 	// string and guaranteed to remain unchanged until the resource is deleted.
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Required. null The list of filters that applies to event attributes. Only events that
 	// match all the provided filters are sent to the destination.
 	EventFilters []*EventFilter `protobuf:"bytes,8,rep,name=event_filters,json=eventFilters,proto3" json:"event_filters,omitempty"`
@@ -137,14 +137,14 @@ func (x *Trigger) GetUid() string {
 	return ""
 }
 
-func (x *Trigger) GetCreateTime() *timestamp.Timestamp {
+func (x *Trigger) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Trigger) GetUpdateTime() *timestamp.Timestamp {
+func (x *Trigger) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -830,15 +830,15 @@ func file_google_cloud_eventarc_v1_trigger_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_eventarc_v1_trigger_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_google_cloud_eventarc_v1_trigger_proto_goTypes = []interface{}{
-	(*Trigger)(nil),             // 0: google.cloud.eventarc.v1.Trigger
-	(*EventFilter)(nil),         // 1: google.cloud.eventarc.v1.EventFilter
-	(*Destination)(nil),         // 2: google.cloud.eventarc.v1.Destination
-	(*Transport)(nil),           // 3: google.cloud.eventarc.v1.Transport
-	(*CloudRun)(nil),            // 4: google.cloud.eventarc.v1.CloudRun
-	(*GKE)(nil),                 // 5: google.cloud.eventarc.v1.GKE
-	(*Pubsub)(nil),              // 6: google.cloud.eventarc.v1.Pubsub
-	nil,                         // 7: google.cloud.eventarc.v1.Trigger.LabelsEntry
-	(*timestamp.Timestamp)(nil), // 8: google.protobuf.Timestamp
+	(*Trigger)(nil),               // 0: google.cloud.eventarc.v1.Trigger
+	(*EventFilter)(nil),           // 1: google.cloud.eventarc.v1.EventFilter
+	(*Destination)(nil),           // 2: google.cloud.eventarc.v1.Destination
+	(*Transport)(nil),             // 3: google.cloud.eventarc.v1.Transport
+	(*CloudRun)(nil),              // 4: google.cloud.eventarc.v1.CloudRun
+	(*GKE)(nil),                   // 5: google.cloud.eventarc.v1.GKE
+	(*Pubsub)(nil),                // 6: google.cloud.eventarc.v1.Pubsub
+	nil,                           // 7: google.cloud.eventarc.v1.Trigger.LabelsEntry
+	(*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp
 }
 var file_google_cloud_eventarc_v1_trigger_proto_depIdxs = []int32{
 	8, // 0: google.cloud.eventarc.v1.Trigger.create_time:type_name -> google.protobuf.Timestamp
diff --git a/eventarc/go.mod b/eventarc/go.mod
index 393354a77e4..d256cbbfed8 100644
--- a/eventarc/go.mod
+++ b/eventarc/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/eventarc
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/eventarc/go.sum b/eventarc/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/eventarc/go.sum
+++ b/eventarc/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/eventarc/publishing/apiv1/doc.go b/eventarc/publishing/apiv1/doc.go
index ff0e80f0b30..8ae073db365 100644
--- a/eventarc/publishing/apiv1/doc.go
+++ b/eventarc/publishing/apiv1/doc.go
@@ -55,9 +55,9 @@
 //	}
 //	defer c.Close()
 //
-//	req := &publisherpb.PublishChannelConnectionEventsRequest{
+//	req := &publishingpb.PublishChannelConnectionEventsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1#PublishChannelConnectionEventsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/eventarc/publishing/apiv1/publishingpb#PublishChannelConnectionEventsRequest.
 //	}
 //	resp, err := c.PublishChannelConnectionEvents(ctx, req)
 //	if err != nil {
diff --git a/eventarc/publishing/apiv1/publisher_client.go b/eventarc/publishing/apiv1/publisher_client.go
index b5e7d6acd7f..75b8f1c11c8 100644
--- a/eventarc/publishing/apiv1/publisher_client.go
+++ b/eventarc/publishing/apiv1/publisher_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	publishingpb "cloud.google.com/go/eventarc/publishing/apiv1/publishingpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	publisherpb "google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
@@ -64,8 +64,8 @@ type internalPublisherClient interface {
 	Close() error
 	setGoogleClientInfo(...string)
 	Connection() *grpc.ClientConn
-	PublishChannelConnectionEvents(context.Context, *publisherpb.PublishChannelConnectionEventsRequest, ...gax.CallOption) (*publisherpb.PublishChannelConnectionEventsResponse, error)
-	PublishEvents(context.Context, *publisherpb.PublishEventsRequest, ...gax.CallOption) (*publisherpb.PublishEventsResponse, error)
+	PublishChannelConnectionEvents(context.Context, *publishingpb.PublishChannelConnectionEventsRequest, ...gax.CallOption) (*publishingpb.PublishChannelConnectionEventsResponse, error)
+	PublishEvents(context.Context, *publishingpb.PublishEventsRequest, ...gax.CallOption) (*publishingpb.PublishEventsResponse, error)
 }
 
 // PublisherClient is a client for interacting with Eventarc Publishing API.
@@ -127,12 +127,12 @@ func (c *PublisherClient) Connection() *grpc.ClientConn {
 }
 
 // PublishChannelConnectionEvents publish events to a ChannelConnection in a partner’s project.
-func (c *PublisherClient) PublishChannelConnectionEvents(ctx context.Context, req *publisherpb.PublishChannelConnectionEventsRequest, opts ...gax.CallOption) (*publisherpb.PublishChannelConnectionEventsResponse, error) {
+func (c *PublisherClient) PublishChannelConnectionEvents(ctx context.Context, req *publishingpb.PublishChannelConnectionEventsRequest, opts ...gax.CallOption) (*publishingpb.PublishChannelConnectionEventsResponse, error) {
 	return c.internalClient.PublishChannelConnectionEvents(ctx, req, opts...)
 }
 
 // PublishEvents publish events to a subscriber’s channel.
-func (c *PublisherClient) PublishEvents(ctx context.Context, req *publisherpb.PublishEventsRequest, opts ...gax.CallOption) (*publisherpb.PublishEventsResponse, error) {
+func (c *PublisherClient) PublishEvents(ctx context.Context, req *publishingpb.PublishEventsRequest, opts ...gax.CallOption) (*publishingpb.PublishEventsResponse, error) {
 	return c.internalClient.PublishEvents(ctx, req, opts...)
 }
 
@@ -150,7 +150,7 @@ type publisherGRPCClient struct {
 	CallOptions **PublisherCallOptions
 
 	// The gRPC API client.
-	publisherClient publisherpb.PublisherClient
+	publisherClient publishingpb.PublisherClient
 
 	// The x-goog-* metadata to be sent with each request.
 	xGoogMetadata metadata.MD
@@ -207,7 +207,7 @@ func NewPublisherClient(ctx context.Context, opts ...option.ClientOption) (*Publ
 	c := &publisherGRPCClient{
 		connPool:         connPool,
 		disableDeadlines: disableDeadlines,
-		publisherClient:  publisherpb.NewPublisherClient(connPool),
+		publisherClient:  publishingpb.NewPublisherClient(connPool),
 		CallOptions:      &client.CallOptions,
 	}
 	c.setGoogleClientInfo()
@@ -240,7 +240,7 @@ func (c *publisherGRPCClient) Close() error {
 	return c.connPool.Close()
 }
 
-func (c *publisherGRPCClient) PublishChannelConnectionEvents(ctx context.Context, req *publisherpb.PublishChannelConnectionEventsRequest, opts ...gax.CallOption) (*publisherpb.PublishChannelConnectionEventsResponse, error) {
+func (c *publisherGRPCClient) PublishChannelConnectionEvents(ctx context.Context, req *publishingpb.PublishChannelConnectionEventsRequest, opts ...gax.CallOption) (*publishingpb.PublishChannelConnectionEventsResponse, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 60000*time.Millisecond)
 		defer cancel()
@@ -250,7 +250,7 @@ func (c *publisherGRPCClient) PublishChannelConnectionEvents(ctx context.Context
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).PublishChannelConnectionEvents[0:len((*c.CallOptions).PublishChannelConnectionEvents):len((*c.CallOptions).PublishChannelConnectionEvents)], opts...)
-	var resp *publisherpb.PublishChannelConnectionEventsResponse
+	var resp *publishingpb.PublishChannelConnectionEventsResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.publisherClient.PublishChannelConnectionEvents(ctx, req, settings.GRPC...)
@@ -262,12 +262,12 @@ func (c *publisherGRPCClient) PublishChannelConnectionEvents(ctx context.Context
 	return resp, nil
 }
 
-func (c *publisherGRPCClient) PublishEvents(ctx context.Context, req *publisherpb.PublishEventsRequest, opts ...gax.CallOption) (*publisherpb.PublishEventsResponse, error) {
+func (c *publisherGRPCClient) PublishEvents(ctx context.Context, req *publishingpb.PublishEventsRequest, opts ...gax.CallOption) (*publishingpb.PublishEventsResponse, error) {
 	md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "channel", url.QueryEscape(req.GetChannel())))
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).PublishEvents[0:len((*c.CallOptions).PublishEvents):len((*c.CallOptions).PublishEvents)], opts...)
-	var resp *publisherpb.PublishEventsResponse
+	var resp *publishingpb.PublishEventsResponse
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.publisherClient.PublishEvents(ctx, req, settings.GRPC...)
diff --git a/eventarc/publishing/apiv1/publisher_client_example_test.go b/eventarc/publishing/apiv1/publisher_client_example_test.go
index 691d9c4188a..8d76c2ed833 100644
--- a/eventarc/publishing/apiv1/publisher_client_example_test.go
+++ b/eventarc/publishing/apiv1/publisher_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	publishing "cloud.google.com/go/eventarc/publishing/apiv1"
-	publisherpb "google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1"
+	publishingpb "cloud.google.com/go/eventarc/publishing/apiv1/publishingpb"
 )
 
 func ExampleNewPublisherClient() {
@@ -53,9 +53,9 @@ func ExamplePublisherClient_PublishChannelConnectionEvents() {
 	}
 	defer c.Close()
 
-	req := &publisherpb.PublishChannelConnectionEventsRequest{
+	req := &publishingpb.PublishChannelConnectionEventsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1#PublishChannelConnectionEventsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/publishing/apiv1/publishingpb#PublishChannelConnectionEventsRequest.
 	}
 	resp, err := c.PublishChannelConnectionEvents(ctx, req)
 	if err != nil {
@@ -78,9 +78,9 @@ func ExamplePublisherClient_PublishEvents() {
 	}
 	defer c.Close()
 
-	req := &publisherpb.PublishEventsRequest{
+	req := &publishingpb.PublishEventsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1#PublishEventsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/publishing/apiv1/publishingpb#PublishEventsRequest.
 	}
 	resp, err := c.PublishEvents(ctx, req)
 	if err != nil {
diff --git a/eventarc/publishing/apiv1/publishingpb/publisher.pb.go b/eventarc/publishing/apiv1/publishingpb/publisher.pb.go
index 0b5dcdbc774..b64be0f8187 100644
--- a/eventarc/publishing/apiv1/publishingpb/publisher.pb.go
+++ b/eventarc/publishing/apiv1/publishingpb/publisher.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/eventarc/publishing/v1/publisher.proto
 
 package publishingpb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
 )
 
 const (
@@ -51,7 +51,7 @@ type PublishChannelConnectionEventsRequest struct {
 	// `projects/{partner_project_id}/locations/{location}/channelConnections/{channel_connection_id}`.
 	ChannelConnection string `protobuf:"bytes,1,opt,name=channel_connection,json=channelConnection,proto3" json:"channel_connection,omitempty"`
 	// The CloudEvents v1.0 events to publish. No other types are allowed.
-	Events []*any1.Any `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
+	Events []*anypb.Any `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
 }
 
 func (x *PublishChannelConnectionEventsRequest) Reset() {
@@ -93,7 +93,7 @@ func (x *PublishChannelConnectionEventsRequest) GetChannelConnection() string {
 	return ""
 }
 
-func (x *PublishChannelConnectionEventsRequest) GetEvents() []*any1.Any {
+func (x *PublishChannelConnectionEventsRequest) GetEvents() []*anypb.Any {
 	if x != nil {
 		return x.Events
 	}
@@ -149,7 +149,7 @@ type PublishEventsRequest struct {
 	// `projects/{project}/locations/{location}/channels/{channel-id}`.
 	Channel string `protobuf:"bytes,1,opt,name=channel,proto3" json:"channel,omitempty"`
 	// The CloudEvents v1.0 events to publish. No other types are allowed.
-	Events []*any1.Any `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
+	Events []*anypb.Any `protobuf:"bytes,2,rep,name=events,proto3" json:"events,omitempty"`
 }
 
 func (x *PublishEventsRequest) Reset() {
@@ -191,7 +191,7 @@ func (x *PublishEventsRequest) GetChannel() string {
 	return ""
 }
 
-func (x *PublishEventsRequest) GetEvents() []*any1.Any {
+func (x *PublishEventsRequest) GetEvents() []*anypb.Any {
 	if x != nil {
 		return x.Events
 	}
@@ -344,7 +344,7 @@ var file_google_cloud_eventarc_publishing_v1_publisher_proto_goTypes = []interfa
 	(*PublishChannelConnectionEventsResponse)(nil), // 1: google.cloud.eventarc.publishing.v1.PublishChannelConnectionEventsResponse
 	(*PublishEventsRequest)(nil),                   // 2: google.cloud.eventarc.publishing.v1.PublishEventsRequest
 	(*PublishEventsResponse)(nil),                  // 3: google.cloud.eventarc.publishing.v1.PublishEventsResponse
-	(*any1.Any)(nil),                               // 4: google.protobuf.Any
+	(*anypb.Any)(nil),                              // 4: google.protobuf.Any
 }
 var file_google_cloud_eventarc_publishing_v1_publisher_proto_depIdxs = []int32{
 	4, // 0: google.cloud.eventarc.publishing.v1.PublishChannelConnectionEventsRequest.events:type_name -> google.protobuf.Any
diff --git a/filestore/aliasshim/aliasshim.go b/filestore/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/filestore/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/filestore/apiv1/cloud_filestore_manager_client.go b/filestore/apiv1/cloud_filestore_manager_client.go
index 5fad20a6bd9..fad7dfb6ee3 100644
--- a/filestore/apiv1/cloud_filestore_manager_client.go
+++ b/filestore/apiv1/cloud_filestore_manager_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -31,7 +32,6 @@ import (
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	commonpb "google.golang.org/genproto/googleapis/cloud/common"
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/filestore/apiv1/cloud_filestore_manager_client_example_test.go b/filestore/apiv1/cloud_filestore_manager_client_example_test.go
index 9621f6e3acb..e939655ef38 100644
--- a/filestore/apiv1/cloud_filestore_manager_client_example_test.go
+++ b/filestore/apiv1/cloud_filestore_manager_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 	"google.golang.org/api/iterator"
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
 )
 
 func ExampleNewCloudFilestoreManagerClient() {
@@ -56,7 +56,7 @@ func ExampleCloudFilestoreManagerClient_ListInstances() {
 
 	req := &filestorepb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleCloudFilestoreManagerClient_GetInstance() {
 
 	req := &filestorepb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleCloudFilestoreManagerClient_CreateInstance() {
 
 	req := &filestorepb.CreateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#CreateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#CreateInstanceRequest.
 	}
 	op, err := c.CreateInstance(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleCloudFilestoreManagerClient_UpdateInstance() {
 
 	req := &filestorepb.UpdateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#UpdateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#UpdateInstanceRequest.
 	}
 	op, err := c.UpdateInstance(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleCloudFilestoreManagerClient_RestoreInstance() {
 
 	req := &filestorepb.RestoreInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#RestoreInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#RestoreInstanceRequest.
 	}
 	op, err := c.RestoreInstance(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleCloudFilestoreManagerClient_DeleteInstance() {
 
 	req := &filestorepb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
@@ -230,7 +230,7 @@ func ExampleCloudFilestoreManagerClient_ListBackups() {
 
 	req := &filestorepb.ListBackupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#ListBackupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#ListBackupsRequest.
 	}
 	it := c.ListBackups(ctx, req)
 	for {
@@ -261,7 +261,7 @@ func ExampleCloudFilestoreManagerClient_GetBackup() {
 
 	req := &filestorepb.GetBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#GetBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#GetBackupRequest.
 	}
 	resp, err := c.GetBackup(ctx, req)
 	if err != nil {
@@ -286,7 +286,7 @@ func ExampleCloudFilestoreManagerClient_CreateBackup() {
 
 	req := &filestorepb.CreateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#CreateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#CreateBackupRequest.
 	}
 	op, err := c.CreateBackup(ctx, req)
 	if err != nil {
@@ -316,7 +316,7 @@ func ExampleCloudFilestoreManagerClient_DeleteBackup() {
 
 	req := &filestorepb.DeleteBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#DeleteBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#DeleteBackupRequest.
 	}
 	op, err := c.DeleteBackup(ctx, req)
 	if err != nil {
@@ -344,7 +344,7 @@ func ExampleCloudFilestoreManagerClient_UpdateBackup() {
 
 	req := &filestorepb.UpdateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#UpdateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#UpdateBackupRequest.
 	}
 	op, err := c.UpdateBackup(ctx, req)
 	if err != nil {
diff --git a/filestore/apiv1/doc.go b/filestore/apiv1/doc.go
index 8bb8930e6e9..a2552fc0ca5 100644
--- a/filestore/apiv1/doc.go
+++ b/filestore/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &filestorepb.ListInstancesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#ListInstancesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#ListInstancesRequest.
 //	}
 //	it := c.ListInstances(ctx, req)
 //	for {
diff --git a/filestore/apiv1/filestorepb/cloud_filestore_service.pb.go b/filestore/apiv1/filestorepb/cloud_filestore_service.pb.go
index 1805e513f0c..5e3ffcd74f5 100644
--- a/filestore/apiv1/filestorepb/cloud_filestore_service.pb.go
+++ b/filestore/apiv1/filestorepb/cloud_filestore_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/filestore/v1/cloud_filestore_service.proto
 
 package filestorepb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	_ "google.golang.org/genproto/googleapis/cloud/common"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -714,7 +714,7 @@ type Instance struct {
 	// Output only. Additional information about the instance state, if available.
 	StatusMessage string `protobuf:"bytes,6,opt,name=status_message,json=statusMessage,proto3" json:"status_message,omitempty"`
 	// Output only. The time when the instance was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The service tier of the instance.
 	Tier Instance_Tier `protobuf:"varint,8,opt,name=tier,proto3,enum=google.cloud.filestore.v1.Instance_Tier" json:"tier,omitempty"`
 	// Resource labels to represent user provided metadata.
@@ -729,7 +729,7 @@ type Instance struct {
 	// updates from overwriting each other.
 	Etag string `protobuf:"bytes,12,opt,name=etag,proto3" json:"etag,omitempty"`
 	// Output only. Reserved for future use.
-	SatisfiesPzs *wrappers.BoolValue `protobuf:"bytes,13,opt,name=satisfies_pzs,json=satisfiesPzs,proto3" json:"satisfies_pzs,omitempty"`
+	SatisfiesPzs *wrapperspb.BoolValue `protobuf:"bytes,13,opt,name=satisfies_pzs,json=satisfiesPzs,proto3" json:"satisfies_pzs,omitempty"`
 }
 
 func (x *Instance) Reset() {
@@ -792,7 +792,7 @@ func (x *Instance) GetStatusMessage() string {
 	return ""
 }
 
-func (x *Instance) GetCreateTime() *timestamp.Timestamp {
+func (x *Instance) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -834,7 +834,7 @@ func (x *Instance) GetEtag() string {
 	return ""
 }
 
-func (x *Instance) GetSatisfiesPzs() *wrappers.BoolValue {
+func (x *Instance) GetSatisfiesPzs() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.SatisfiesPzs
 	}
@@ -974,7 +974,7 @@ type UpdateInstanceRequest struct {
 	// * "description"
 	// * "file_shares"
 	// * "labels"
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Only fields specified in update_mask are updated.
 	Instance *Instance `protobuf:"bytes,2,opt,name=instance,proto3" json:"instance,omitempty"`
 }
@@ -1011,7 +1011,7 @@ func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_filestore_v1_cloud_filestore_service_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *UpdateInstanceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateInstanceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1344,7 +1344,7 @@ type Backup struct {
 	// Output only. The backup state.
 	State Backup_State `protobuf:"varint,3,opt,name=state,proto3,enum=google.cloud.filestore.v1.Backup_State" json:"state,omitempty"`
 	// Output only. The time when the backup was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Resource labels to represent user provided metadata.
 	Labels map[string]string `protobuf:"bytes,5,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. Capacity of the source file share when the backup was created.
@@ -1367,7 +1367,7 @@ type Backup struct {
 	// backups of the same disk will share storage.
 	DownloadBytes int64 `protobuf:"varint,11,opt,name=download_bytes,json=downloadBytes,proto3" json:"download_bytes,omitempty"`
 	// Output only. Reserved for future use.
-	SatisfiesPzs *wrappers.BoolValue `protobuf:"bytes,12,opt,name=satisfies_pzs,json=satisfiesPzs,proto3" json:"satisfies_pzs,omitempty"`
+	SatisfiesPzs *wrapperspb.BoolValue `protobuf:"bytes,12,opt,name=satisfies_pzs,json=satisfiesPzs,proto3" json:"satisfies_pzs,omitempty"`
 }
 
 func (x *Backup) Reset() {
@@ -1423,7 +1423,7 @@ func (x *Backup) GetState() Backup_State {
 	return Backup_STATE_UNSPECIFIED
 }
 
-func (x *Backup) GetCreateTime() *timestamp.Timestamp {
+func (x *Backup) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1479,7 +1479,7 @@ func (x *Backup) GetDownloadBytes() int64 {
 	return 0
 }
 
-func (x *Backup) GetSatisfiesPzs() *wrappers.BoolValue {
+func (x *Backup) GetSatisfiesPzs() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.SatisfiesPzs
 	}
@@ -1621,7 +1621,7 @@ type UpdateBackupRequest struct {
 	Backup *Backup `protobuf:"bytes,1,opt,name=backup,proto3" json:"backup,omitempty"`
 	// Required. Mask of fields to update.  At least one path must be supplied in
 	// this field.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateBackupRequest) Reset() {
@@ -1663,7 +1663,7 @@ func (x *UpdateBackupRequest) GetBackup() *Backup {
 	return nil
 }
 
-func (x *UpdateBackupRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateBackupRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2419,9 +2419,9 @@ var file_google_cloud_filestore_v1_cloud_filestore_service_proto_goTypes = []int
 	(*ListBackupsResponse)(nil),      // 23: google.cloud.filestore.v1.ListBackupsResponse
 	nil,                              // 24: google.cloud.filestore.v1.Instance.LabelsEntry
 	nil,                              // 25: google.cloud.filestore.v1.Backup.LabelsEntry
-	(*timestamp.Timestamp)(nil),      // 26: google.protobuf.Timestamp
-	(*wrappers.BoolValue)(nil),       // 27: google.protobuf.BoolValue
-	(*field_mask.FieldMask)(nil),     // 28: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),    // 26: google.protobuf.Timestamp
+	(*wrapperspb.BoolValue)(nil),     // 27: google.protobuf.BoolValue
+	(*fieldmaskpb.FieldMask)(nil),    // 28: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),    // 29: google.longrunning.Operation
 }
 var file_google_cloud_filestore_v1_cloud_filestore_service_proto_depIdxs = []int32{
diff --git a/filestore/go.mod b/filestore/go.mod
index c853b1c3449..0f4f165809d 100644
--- a/filestore/go.mod
+++ b/filestore/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/filestore
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/filestore/go.sum b/filestore/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/filestore/go.sum
+++ b/filestore/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/functions/apiv1/cloud_functions_client.go b/functions/apiv1/cloud_functions_client.go
index 42be37d259f..e4f962e2b80 100644
--- a/functions/apiv1/cloud_functions_client.go
+++ b/functions/apiv1/cloud_functions_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/functions/apiv1/cloud_functions_client_example_test.go b/functions/apiv1/cloud_functions_client_example_test.go
index 54769154335..a2bfa81e6a8 100644
--- a/functions/apiv1/cloud_functions_client_example_test.go
+++ b/functions/apiv1/cloud_functions_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 	"google.golang.org/api/iterator"
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleCloudFunctionsClient_ListFunctions() {
 
 	req := &functionspb.ListFunctionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#ListFunctionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#ListFunctionsRequest.
 	}
 	it := c.ListFunctions(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleCloudFunctionsClient_GetFunction() {
 
 	req := &functionspb.GetFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#GetFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#GetFunctionRequest.
 	}
 	resp, err := c.GetFunction(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleCloudFunctionsClient_CreateFunction() {
 
 	req := &functionspb.CreateFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#CreateFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#CreateFunctionRequest.
 	}
 	op, err := c.CreateFunction(ctx, req)
 	if err != nil {
@@ -143,7 +143,7 @@ func ExampleCloudFunctionsClient_UpdateFunction() {
 
 	req := &functionspb.UpdateFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#UpdateFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#UpdateFunctionRequest.
 	}
 	op, err := c.UpdateFunction(ctx, req)
 	if err != nil {
@@ -173,7 +173,7 @@ func ExampleCloudFunctionsClient_DeleteFunction() {
 
 	req := &functionspb.DeleteFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#DeleteFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#DeleteFunctionRequest.
 	}
 	op, err := c.DeleteFunction(ctx, req)
 	if err != nil {
@@ -201,7 +201,7 @@ func ExampleCloudFunctionsClient_CallFunction() {
 
 	req := &functionspb.CallFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#CallFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#CallFunctionRequest.
 	}
 	resp, err := c.CallFunction(ctx, req)
 	if err != nil {
@@ -226,7 +226,7 @@ func ExampleCloudFunctionsClient_GenerateUploadUrl() {
 
 	req := &functionspb.GenerateUploadUrlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#GenerateUploadUrlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#GenerateUploadUrlRequest.
 	}
 	resp, err := c.GenerateUploadUrl(ctx, req)
 	if err != nil {
@@ -251,7 +251,7 @@ func ExampleCloudFunctionsClient_GenerateDownloadUrl() {
 
 	req := &functionspb.GenerateDownloadUrlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#GenerateDownloadUrlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#GenerateDownloadUrlRequest.
 	}
 	resp, err := c.GenerateDownloadUrl(ctx, req)
 	if err != nil {
diff --git a/functions/apiv1/doc.go b/functions/apiv1/doc.go
index 7603fb08f10..c9d1c058264 100644
--- a/functions/apiv1/doc.go
+++ b/functions/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &functionspb.ListFunctionsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#ListFunctionsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#ListFunctionsRequest.
 //	}
 //	it := c.ListFunctions(ctx, req)
 //	for {
diff --git a/functions/apiv1/functionspb/functions.pb.go b/functions/apiv1/functionspb/functions.pb.go
index d0a2881c605..706b0cd5883 100644
--- a/functions/apiv1/functionspb/functions.pb.go
+++ b/functions/apiv1/functionspb/functions.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/functions/v1/functions.proto
 
 package functionspb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -393,7 +393,7 @@ type CloudFunction struct {
 	// The function execution timeout. Execution is considered failed and
 	// can be terminated if the function is not completed at the end of the
 	// timeout period. Defaults to 60 seconds.
-	Timeout *duration.Duration `protobuf:"bytes,9,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,9,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// The amount of memory in MB available for a function.
 	// Defaults to 256MB.
 	AvailableMemoryMb int32 `protobuf:"varint,10,opt,name=available_memory_mb,json=availableMemoryMb,proto3" json:"available_memory_mb,omitempty"`
@@ -401,7 +401,7 @@ type CloudFunction struct {
 	// `{project_id}@appspot.gserviceaccount.com`.
 	ServiceAccountEmail string `protobuf:"bytes,11,opt,name=service_account_email,json=serviceAccountEmail,proto3" json:"service_account_email,omitempty"`
 	// Output only. The last update timestamp of a Cloud Function.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The version identifier of the Cloud Function. Each deployment attempt
 	// results in a new version of a function being created.
 	VersionId int64 `protobuf:"varint,14,opt,name=version_id,json=versionId,proto3" json:"version_id,omitempty"`
@@ -654,7 +654,7 @@ func (x *CloudFunction) GetRuntime() string {
 	return ""
 }
 
-func (x *CloudFunction) GetTimeout() *duration.Duration {
+func (x *CloudFunction) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -675,7 +675,7 @@ func (x *CloudFunction) GetServiceAccountEmail() string {
 	return ""
 }
 
-func (x *CloudFunction) GetUpdateTime() *timestamp.Timestamp {
+func (x *CloudFunction) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1424,7 +1424,7 @@ type UpdateFunctionRequest struct {
 	// Required. New version of the function.
 	Function *CloudFunction `protobuf:"bytes,1,opt,name=function,proto3" json:"function,omitempty"`
 	// Required. The list of fields in `CloudFunction` that have to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateFunctionRequest) Reset() {
@@ -1466,7 +1466,7 @@ func (x *UpdateFunctionRequest) GetFunction() *CloudFunction {
 	return nil
 }
 
-func (x *UpdateFunctionRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateFunctionRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2753,9 +2753,9 @@ var file_google_cloud_functions_v1_functions_proto_goTypes = []interface{}{
 	nil,                                           // 26: google.cloud.functions.v1.CloudFunction.BuildEnvironmentVariablesEntry
 	(*FailurePolicy_Retry)(nil),                   // 27: google.cloud.functions.v1.FailurePolicy.Retry
 	(*SecretVolume_SecretVersion)(nil),            // 28: google.cloud.functions.v1.SecretVolume.SecretVersion
-	(*duration.Duration)(nil),                     // 29: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),                   // 30: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                  // 31: google.protobuf.FieldMask
+	(*durationpb.Duration)(nil),                   // 29: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                 // 30: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                 // 31: google.protobuf.FieldMask
 	(*v1.SetIamPolicyRequest)(nil),                // 32: google.iam.v1.SetIamPolicyRequest
 	(*v1.GetIamPolicyRequest)(nil),                // 33: google.iam.v1.GetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),          // 34: google.iam.v1.TestIamPermissionsRequest
diff --git a/functions/apiv1/functionspb/operations.pb.go b/functions/apiv1/functionspb/operations.pb.go
index b34aba2355b..df9f3cc73cb 100644
--- a/functions/apiv1/functionspb/operations.pb.go
+++ b/functions/apiv1/functionspb/operations.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/functions/v1/operations.proto
 
 package functionspb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -106,12 +106,12 @@ type OperationMetadataV1 struct {
 	// Type of operation.
 	Type OperationType `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.functions.v1.OperationType" json:"type,omitempty"`
 	// The original request that started the operation.
-	Request *any1.Any `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
+	Request *anypb.Any `protobuf:"bytes,3,opt,name=request,proto3" json:"request,omitempty"`
 	// Version id of the function created or updated by an API call.
 	// This field is only populated for Create and Update operations.
 	VersionId int64 `protobuf:"varint,4,opt,name=version_id,json=versionId,proto3" json:"version_id,omitempty"`
 	// The last update timestamp of the operation.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The Cloud Build ID of the function created or updated by an API call.
 	// This field is only populated for Create and Update operations.
 	BuildId string `protobuf:"bytes,6,opt,name=build_id,json=buildId,proto3" json:"build_id,omitempty"`
@@ -170,7 +170,7 @@ func (x *OperationMetadataV1) GetType() OperationType {
 	return OperationType_OPERATION_UNSPECIFIED
 }
 
-func (x *OperationMetadataV1) GetRequest() *any1.Any {
+func (x *OperationMetadataV1) GetRequest() *anypb.Any {
 	if x != nil {
 		return x.Request
 	}
@@ -184,7 +184,7 @@ func (x *OperationMetadataV1) GetVersionId() int64 {
 	return 0
 }
 
-func (x *OperationMetadataV1) GetUpdateTime() *timestamp.Timestamp {
+func (x *OperationMetadataV1) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -277,10 +277,10 @@ func file_google_cloud_functions_v1_operations_proto_rawDescGZIP() []byte {
 var file_google_cloud_functions_v1_operations_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_functions_v1_operations_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_functions_v1_operations_proto_goTypes = []interface{}{
-	(OperationType)(0),          // 0: google.cloud.functions.v1.OperationType
-	(*OperationMetadataV1)(nil), // 1: google.cloud.functions.v1.OperationMetadataV1
-	(*any1.Any)(nil),            // 2: google.protobuf.Any
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(OperationType)(0),            // 0: google.cloud.functions.v1.OperationType
+	(*OperationMetadataV1)(nil),   // 1: google.cloud.functions.v1.OperationMetadataV1
+	(*anypb.Any)(nil),             // 2: google.protobuf.Any
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
 }
 var file_google_cloud_functions_v1_operations_proto_depIdxs = []int32{
 	0, // 0: google.cloud.functions.v1.OperationMetadataV1.type:type_name -> google.cloud.functions.v1.OperationType
diff --git a/functions/apiv2/doc.go b/functions/apiv2/doc.go
index 8ba4476ea26..2a49ca76f00 100644
--- a/functions/apiv2/doc.go
+++ b/functions/apiv2/doc.go
@@ -60,7 +60,7 @@
 //
 //	req := &functionspb.GetFunctionRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#GetFunctionRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#GetFunctionRequest.
 //	}
 //	resp, err := c.GetFunction(ctx, req)
 //	if err != nil {
diff --git a/functions/apiv2/function_client.go b/functions/apiv2/function_client.go
index 879cfcff83f..146f47cca11 100644
--- a/functions/apiv2/function_client.go
+++ b/functions/apiv2/function_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
diff --git a/functions/apiv2/function_client_example_test.go b/functions/apiv2/function_client_example_test.go
index 15bcedbf9dc..2710b9a3615 100644
--- a/functions/apiv2/function_client_example_test.go
+++ b/functions/apiv2/function_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 	"google.golang.org/api/iterator"
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
@@ -59,7 +59,7 @@ func ExampleFunctionClient_GetFunction() {
 
 	req := &functionspb.GetFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#GetFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#GetFunctionRequest.
 	}
 	resp, err := c.GetFunction(ctx, req)
 	if err != nil {
@@ -84,7 +84,7 @@ func ExampleFunctionClient_ListFunctions() {
 
 	req := &functionspb.ListFunctionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#ListFunctionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#ListFunctionsRequest.
 	}
 	it := c.ListFunctions(ctx, req)
 	for {
@@ -115,7 +115,7 @@ func ExampleFunctionClient_CreateFunction() {
 
 	req := &functionspb.CreateFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#CreateFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#CreateFunctionRequest.
 	}
 	op, err := c.CreateFunction(ctx, req)
 	if err != nil {
@@ -145,7 +145,7 @@ func ExampleFunctionClient_UpdateFunction() {
 
 	req := &functionspb.UpdateFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#UpdateFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#UpdateFunctionRequest.
 	}
 	op, err := c.UpdateFunction(ctx, req)
 	if err != nil {
@@ -175,7 +175,7 @@ func ExampleFunctionClient_DeleteFunction() {
 
 	req := &functionspb.DeleteFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#DeleteFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#DeleteFunctionRequest.
 	}
 	op, err := c.DeleteFunction(ctx, req)
 	if err != nil {
@@ -203,7 +203,7 @@ func ExampleFunctionClient_GenerateUploadUrl() {
 
 	req := &functionspb.GenerateUploadUrlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#GenerateUploadUrlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#GenerateUploadUrlRequest.
 	}
 	resp, err := c.GenerateUploadUrl(ctx, req)
 	if err != nil {
@@ -228,7 +228,7 @@ func ExampleFunctionClient_GenerateDownloadUrl() {
 
 	req := &functionspb.GenerateDownloadUrlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#GenerateDownloadUrlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#GenerateDownloadUrlRequest.
 	}
 	resp, err := c.GenerateDownloadUrl(ctx, req)
 	if err != nil {
@@ -253,7 +253,7 @@ func ExampleFunctionClient_ListRuntimes() {
 
 	req := &functionspb.ListRuntimesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#ListRuntimesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#ListRuntimesRequest.
 	}
 	resp, err := c.ListRuntimes(ctx, req)
 	if err != nil {
diff --git a/functions/apiv2/functionspb/functions.pb.go b/functions/apiv2/functionspb/functions.pb.go
index ec2b8d489b8..63b340cd65b 100644
--- a/functions/apiv2/functionspb/functions.pb.go
+++ b/functions/apiv2/functionspb/functions.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/functions/v2/functions.proto
 
 package functionspb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -614,7 +614,7 @@ type Function struct {
 	// Output only. State of the function.
 	State Function_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.cloud.functions.v2.Function_State" json:"state,omitempty"`
 	// Output only. The last update timestamp of a Cloud Function.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Labels associated with this Cloud Function.
 	Labels map[string]string `protobuf:"bytes,8,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. State Messages for this Cloud Function.
@@ -702,7 +702,7 @@ func (x *Function) GetState() Function_State {
 	return Function_STATE_UNSPECIFIED
 }
 
-func (x *Function) GetUpdateTime() *timestamp.Timestamp {
+func (x *Function) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2186,7 +2186,7 @@ type UpdateFunctionRequest struct {
 	// The list of fields to be updated.
 	// If no field mask is provided, all provided fields in the request will be
 	// updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateFunctionRequest) Reset() {
@@ -2228,7 +2228,7 @@ func (x *UpdateFunctionRequest) GetFunction() *Function {
 	return nil
 }
 
-func (x *UpdateFunctionRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateFunctionRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2617,9 +2617,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Name of the verb executed by the operation.
@@ -2634,7 +2634,7 @@ type OperationMetadata struct {
 	// API version used to start the operation.
 	ApiVersion string `protobuf:"bytes,7,opt,name=api_version,json=apiVersion,proto3" json:"api_version,omitempty"`
 	// The original request that started the operation.
-	RequestResource *any1.Any `protobuf:"bytes,8,opt,name=request_resource,json=requestResource,proto3" json:"request_resource,omitempty"`
+	RequestResource *anypb.Any `protobuf:"bytes,8,opt,name=request_resource,json=requestResource,proto3" json:"request_resource,omitempty"`
 	// Mechanism for reporting in-progress stages
 	Stages []*Stage `protobuf:"bytes,9,rep,name=stages,proto3" json:"stages,omitempty"`
 }
@@ -2671,14 +2671,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_functions_v2_functions_proto_rawDescGZIP(), []int{24}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2720,7 +2720,7 @@ func (x *OperationMetadata) GetApiVersion() string {
 	return ""
 }
 
-func (x *OperationMetadata) GetRequestResource() *any1.Any {
+func (x *OperationMetadata) GetRequestResource() *anypb.Any {
 	if x != nil {
 		return x.RequestResource
 	}
@@ -3732,9 +3732,9 @@ var file_google_cloud_functions_v2_functions_proto_goTypes = []interface{}{
 	nil,                                           // 37: google.cloud.functions.v2.ServiceConfig.EnvironmentVariablesEntry
 	(*SecretVolume_SecretVersion)(nil),            // 38: google.cloud.functions.v2.SecretVolume.SecretVersion
 	(*ListRuntimesResponse_Runtime)(nil),          // 39: google.cloud.functions.v2.ListRuntimesResponse.Runtime
-	(*timestamp.Timestamp)(nil),                   // 40: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                  // 41: google.protobuf.FieldMask
-	(*any1.Any)(nil),                              // 42: google.protobuf.Any
+	(*timestamppb.Timestamp)(nil),                 // 40: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                 // 41: google.protobuf.FieldMask
+	(*anypb.Any)(nil),                             // 42: google.protobuf.Any
 	(*longrunning.Operation)(nil),                 // 43: google.longrunning.Operation
 }
 var file_google_cloud_functions_v2_functions_proto_depIdxs = []int32{
diff --git a/functions/go.mod b/functions/go.mod
index c1de15e1c5f..7cfb2c0c224 100644
--- a/functions/go.mod
+++ b/functions/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/functions
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/google/go-cmp v0.5.9
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/functions/go.sum b/functions/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/functions/go.sum
+++ b/functions/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/gaming/apiv1/doc.go b/gaming/apiv1/doc.go
index cdcb7ebbf6f..dba170f05df 100644
--- a/gaming/apiv1/doc.go
+++ b/gaming/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &gamingpb.ListGameServerClustersRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListGameServerClustersRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListGameServerClustersRequest.
 //	}
 //	it := c.ListGameServerClusters(ctx, req)
 //	for {
diff --git a/gaming/apiv1/game_server_clusters_client.go b/gaming/apiv1/game_server_clusters_client.go
index d2764ca1b7d..72dad4f7595 100644
--- a/gaming/apiv1/game_server_clusters_client.go
+++ b/gaming/apiv1/game_server_clusters_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/gaming/apiv1/game_server_clusters_client_example_test.go b/gaming/apiv1/game_server_clusters_client_example_test.go
index 7b1da0c5c04..85234019ee2 100644
--- a/gaming/apiv1/game_server_clusters_client_example_test.go
+++ b/gaming/apiv1/game_server_clusters_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"google.golang.org/api/iterator"
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 )
 
 func ExampleNewGameServerClustersClient() {
@@ -56,7 +56,7 @@ func ExampleGameServerClustersClient_ListGameServerClusters() {
 
 	req := &gamingpb.ListGameServerClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListGameServerClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListGameServerClustersRequest.
 	}
 	it := c.ListGameServerClusters(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleGameServerClustersClient_GetGameServerCluster() {
 
 	req := &gamingpb.GetGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetGameServerClusterRequest.
 	}
 	resp, err := c.GetGameServerCluster(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleGameServerClustersClient_CreateGameServerCluster() {
 
 	req := &gamingpb.CreateGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#CreateGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#CreateGameServerClusterRequest.
 	}
 	op, err := c.CreateGameServerCluster(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleGameServerClustersClient_PreviewCreateGameServerCluster() {
 
 	req := &gamingpb.PreviewCreateGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewCreateGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewCreateGameServerClusterRequest.
 	}
 	resp, err := c.PreviewCreateGameServerCluster(ctx, req)
 	if err != nil {
@@ -167,7 +167,7 @@ func ExampleGameServerClustersClient_DeleteGameServerCluster() {
 
 	req := &gamingpb.DeleteGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#DeleteGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#DeleteGameServerClusterRequest.
 	}
 	op, err := c.DeleteGameServerCluster(ctx, req)
 	if err != nil {
@@ -195,7 +195,7 @@ func ExampleGameServerClustersClient_PreviewDeleteGameServerCluster() {
 
 	req := &gamingpb.PreviewDeleteGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewDeleteGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewDeleteGameServerClusterRequest.
 	}
 	resp, err := c.PreviewDeleteGameServerCluster(ctx, req)
 	if err != nil {
@@ -220,7 +220,7 @@ func ExampleGameServerClustersClient_UpdateGameServerCluster() {
 
 	req := &gamingpb.UpdateGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#UpdateGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#UpdateGameServerClusterRequest.
 	}
 	op, err := c.UpdateGameServerCluster(ctx, req)
 	if err != nil {
@@ -250,7 +250,7 @@ func ExampleGameServerClustersClient_PreviewUpdateGameServerCluster() {
 
 	req := &gamingpb.PreviewUpdateGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewUpdateGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewUpdateGameServerClusterRequest.
 	}
 	resp, err := c.PreviewUpdateGameServerCluster(ctx, req)
 	if err != nil {
diff --git a/gaming/apiv1/game_server_configs_client.go b/gaming/apiv1/game_server_configs_client.go
index f83bbc134e4..b7d8e82d5ae 100644
--- a/gaming/apiv1/game_server_configs_client.go
+++ b/gaming/apiv1/game_server_configs_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/gaming/apiv1/game_server_configs_client_example_test.go b/gaming/apiv1/game_server_configs_client_example_test.go
index c4efe81d3d4..adb2abb69ef 100644
--- a/gaming/apiv1/game_server_configs_client_example_test.go
+++ b/gaming/apiv1/game_server_configs_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"google.golang.org/api/iterator"
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 )
 
 func ExampleNewGameServerConfigsClient() {
@@ -56,7 +56,7 @@ func ExampleGameServerConfigsClient_ListGameServerConfigs() {
 
 	req := &gamingpb.ListGameServerConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListGameServerConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListGameServerConfigsRequest.
 	}
 	it := c.ListGameServerConfigs(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleGameServerConfigsClient_GetGameServerConfig() {
 
 	req := &gamingpb.GetGameServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetGameServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetGameServerConfigRequest.
 	}
 	resp, err := c.GetGameServerConfig(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleGameServerConfigsClient_CreateGameServerConfig() {
 
 	req := &gamingpb.CreateGameServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#CreateGameServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#CreateGameServerConfigRequest.
 	}
 	op, err := c.CreateGameServerConfig(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleGameServerConfigsClient_DeleteGameServerConfig() {
 
 	req := &gamingpb.DeleteGameServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#DeleteGameServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#DeleteGameServerConfigRequest.
 	}
 	op, err := c.DeleteGameServerConfig(ctx, req)
 	if err != nil {
diff --git a/gaming/apiv1/game_server_deployments_client.go b/gaming/apiv1/game_server_deployments_client.go
index e9b9b7595e2..e39dcb2036e 100644
--- a/gaming/apiv1/game_server_deployments_client.go
+++ b/gaming/apiv1/game_server_deployments_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/gaming/apiv1/game_server_deployments_client_example_test.go b/gaming/apiv1/game_server_deployments_client_example_test.go
index d22c9027c96..df09c45458c 100644
--- a/gaming/apiv1/game_server_deployments_client_example_test.go
+++ b/gaming/apiv1/game_server_deployments_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"google.golang.org/api/iterator"
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 )
 
 func ExampleNewGameServerDeploymentsClient() {
@@ -56,7 +56,7 @@ func ExampleGameServerDeploymentsClient_ListGameServerDeployments() {
 
 	req := &gamingpb.ListGameServerDeploymentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListGameServerDeploymentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListGameServerDeploymentsRequest.
 	}
 	it := c.ListGameServerDeployments(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleGameServerDeploymentsClient_GetGameServerDeployment() {
 
 	req := &gamingpb.GetGameServerDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetGameServerDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetGameServerDeploymentRequest.
 	}
 	resp, err := c.GetGameServerDeployment(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleGameServerDeploymentsClient_CreateGameServerDeployment() {
 
 	req := &gamingpb.CreateGameServerDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#CreateGameServerDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#CreateGameServerDeploymentRequest.
 	}
 	op, err := c.CreateGameServerDeployment(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleGameServerDeploymentsClient_DeleteGameServerDeployment() {
 
 	req := &gamingpb.DeleteGameServerDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#DeleteGameServerDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#DeleteGameServerDeploymentRequest.
 	}
 	op, err := c.DeleteGameServerDeployment(ctx, req)
 	if err != nil {
@@ -170,7 +170,7 @@ func ExampleGameServerDeploymentsClient_UpdateGameServerDeployment() {
 
 	req := &gamingpb.UpdateGameServerDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#UpdateGameServerDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#UpdateGameServerDeploymentRequest.
 	}
 	op, err := c.UpdateGameServerDeployment(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleGameServerDeploymentsClient_GetGameServerDeploymentRollout() {
 
 	req := &gamingpb.GetGameServerDeploymentRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetGameServerDeploymentRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetGameServerDeploymentRolloutRequest.
 	}
 	resp, err := c.GetGameServerDeploymentRollout(ctx, req)
 	if err != nil {
@@ -225,7 +225,7 @@ func ExampleGameServerDeploymentsClient_UpdateGameServerDeploymentRollout() {
 
 	req := &gamingpb.UpdateGameServerDeploymentRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#UpdateGameServerDeploymentRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#UpdateGameServerDeploymentRolloutRequest.
 	}
 	op, err := c.UpdateGameServerDeploymentRollout(ctx, req)
 	if err != nil {
@@ -255,7 +255,7 @@ func ExampleGameServerDeploymentsClient_PreviewGameServerDeploymentRollout() {
 
 	req := &gamingpb.PreviewGameServerDeploymentRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewGameServerDeploymentRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewGameServerDeploymentRolloutRequest.
 	}
 	resp, err := c.PreviewGameServerDeploymentRollout(ctx, req)
 	if err != nil {
@@ -280,7 +280,7 @@ func ExampleGameServerDeploymentsClient_FetchDeploymentState() {
 
 	req := &gamingpb.FetchDeploymentStateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#FetchDeploymentStateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#FetchDeploymentStateRequest.
 	}
 	resp, err := c.FetchDeploymentState(ctx, req)
 	if err != nil {
diff --git a/gaming/apiv1/gamingpb/common.pb.go b/gaming/apiv1/gamingpb/common.pb.go
index d514d529fa9..8ae99582dcd 100644
--- a/gaming/apiv1/gamingpb/common.pb.go
+++ b/gaming/apiv1/gamingpb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/common.proto
 
 package gamingpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -97,9 +97,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -154,14 +154,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_gaming_v1_common_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -397,12 +397,12 @@ type Schedule struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The start time of the event.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The end time of the event.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The duration for the cron job event. The duration of the event is effective
 	// after the cron job's start time.
-	CronJobDuration *duration.Duration `protobuf:"bytes,3,opt,name=cron_job_duration,json=cronJobDuration,proto3" json:"cron_job_duration,omitempty"`
+	CronJobDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=cron_job_duration,json=cronJobDuration,proto3" json:"cron_job_duration,omitempty"`
 	// The cron definition of the scheduled event. See
 	// https://en.wikipedia.org/wiki/Cron. Cron spec specifies the local time as
 	// defined by the realm.
@@ -441,21 +441,21 @@ func (*Schedule) Descriptor() ([]byte, []int) {
 	return file_google_cloud_gaming_v1_common_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *Schedule) GetStartTime() *timestamp.Timestamp {
+func (x *Schedule) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Schedule) GetEndTime() *timestamp.Timestamp {
+func (x *Schedule) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
 	return nil
 }
 
-func (x *Schedule) GetCronJobDuration() *duration.Duration {
+func (x *Schedule) GetCronJobDuration() *durationpb.Duration {
 	if x != nil {
 		return x.CronJobDuration
 	}
@@ -1348,8 +1348,8 @@ var file_google_cloud_gaming_v1_common_proto_goTypes = []interface{}{
 	(*DeployedFleetDetails_DeployedFleet)(nil),                     // 15: google.cloud.gaming.v1.DeployedFleetDetails.DeployedFleet
 	(*DeployedFleetDetails_DeployedFleetAutoscaler)(nil),           // 16: google.cloud.gaming.v1.DeployedFleetDetails.DeployedFleetAutoscaler
 	(*DeployedFleetDetails_DeployedFleet_DeployedFleetStatus)(nil), // 17: google.cloud.gaming.v1.DeployedFleetDetails.DeployedFleet.DeployedFleetStatus
-	(*timestamp.Timestamp)(nil),                                    // 18: google.protobuf.Timestamp
-	(*duration.Duration)(nil),                                      // 19: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                                  // 18: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                                    // 19: google.protobuf.Duration
 }
 var file_google_cloud_gaming_v1_common_proto_depIdxs = []int32{
 	18, // 0: google.cloud.gaming.v1.OperationMetadata.create_time:type_name -> google.protobuf.Timestamp
diff --git a/gaming/apiv1/gamingpb/game_server_clusters.pb.go b/gaming/apiv1/gamingpb/game_server_clusters.pb.go
index 1d659257891..0eacbd30ba7 100644
--- a/gaming/apiv1/gamingpb/game_server_clusters.pb.go
+++ b/gaming/apiv1/gamingpb/game_server_clusters.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/game_server_clusters.proto
 
 package gamingpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -495,7 +495,7 @@ type PreviewCreateGameServerClusterRequest struct {
 	// Required. The game server cluster resource to be created.
 	GameServerCluster *GameServerCluster `protobuf:"bytes,3,opt,name=game_server_cluster,json=gameServerCluster,proto3" json:"game_server_cluster,omitempty"`
 	// Optional. The target timestamp to compute the preview.
-	PreviewTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
+	PreviewTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
 	// Optional. This field is deprecated, preview will always return
 	// KubernetesClusterState.
 	//
@@ -556,7 +556,7 @@ func (x *PreviewCreateGameServerClusterRequest) GetGameServerCluster() *GameServ
 	return nil
 }
 
-func (x *PreviewCreateGameServerClusterRequest) GetPreviewTime() *timestamp.Timestamp {
+func (x *PreviewCreateGameServerClusterRequest) GetPreviewTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PreviewTime
 	}
@@ -700,7 +700,7 @@ type PreviewDeleteGameServerClusterRequest struct {
 	// `projects/{project}/locations/{location}/gameServerClusters/{cluster}`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Optional. The target timestamp to compute the preview.
-	PreviewTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
+	PreviewTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
 }
 
 func (x *PreviewDeleteGameServerClusterRequest) Reset() {
@@ -742,7 +742,7 @@ func (x *PreviewDeleteGameServerClusterRequest) GetName() string {
 	return ""
 }
 
-func (x *PreviewDeleteGameServerClusterRequest) GetPreviewTime() *timestamp.Timestamp {
+func (x *PreviewDeleteGameServerClusterRequest) GetPreviewTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PreviewTime
 	}
@@ -820,7 +820,7 @@ type UpdateGameServerClusterRequest struct {
 	// Required. Mask of fields to update. At least one path must be supplied in
 	// this field. For the `FieldMask` definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateGameServerClusterRequest) Reset() {
@@ -862,7 +862,7 @@ func (x *UpdateGameServerClusterRequest) GetGameServerCluster() *GameServerClust
 	return nil
 }
 
-func (x *UpdateGameServerClusterRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateGameServerClusterRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -881,9 +881,9 @@ type PreviewUpdateGameServerClusterRequest struct {
 	// Required. Mask of fields to update. At least one path must be supplied in
 	// this field. For the `FieldMask` definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. The target timestamp to compute the preview.
-	PreviewTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
+	PreviewTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
 }
 
 func (x *PreviewUpdateGameServerClusterRequest) Reset() {
@@ -925,14 +925,14 @@ func (x *PreviewUpdateGameServerClusterRequest) GetGameServerCluster() *GameServ
 	return nil
 }
 
-func (x *PreviewUpdateGameServerClusterRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *PreviewUpdateGameServerClusterRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
 	return nil
 }
 
-func (x *PreviewUpdateGameServerClusterRequest) GetPreviewTime() *timestamp.Timestamp {
+func (x *PreviewUpdateGameServerClusterRequest) GetPreviewTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PreviewTime
 	}
@@ -1149,9 +1149,9 @@ type GameServerCluster struct {
 	// `projects/my-project/locations/{location}/realms/zanzibar/gameServerClusters/my-onprem-cluster`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The labels associated with this game server cluster. Each label is a
 	// key-value pair.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -1206,14 +1206,14 @@ func (x *GameServerCluster) GetName() string {
 	return ""
 }
 
-func (x *GameServerCluster) GetCreateTime() *timestamp.Timestamp {
+func (x *GameServerCluster) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *GameServerCluster) GetUpdateTime() *timestamp.Timestamp {
+func (x *GameServerCluster) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1690,9 +1690,9 @@ var file_google_cloud_gaming_v1_game_server_clusters_proto_goTypes = []interface
 	(*GameServerCluster)(nil),                      // 16: google.cloud.gaming.v1.GameServerCluster
 	(*KubernetesClusterState)(nil),                 // 17: google.cloud.gaming.v1.KubernetesClusterState
 	nil,                                            // 18: google.cloud.gaming.v1.GameServerCluster.LabelsEntry
-	(*timestamp.Timestamp)(nil),                    // 19: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                  // 19: google.protobuf.Timestamp
 	(*TargetState)(nil),                            // 20: google.cloud.gaming.v1.TargetState
-	(*field_mask.FieldMask)(nil),                   // 21: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                  // 21: google.protobuf.FieldMask
 }
 var file_google_cloud_gaming_v1_game_server_clusters_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.gaming.v1.ListGameServerClustersRequest.view:type_name -> google.cloud.gaming.v1.GameServerClusterView
diff --git a/gaming/apiv1/gamingpb/game_server_clusters_service.pb.go b/gaming/apiv1/gamingpb/game_server_clusters_service.pb.go
index 95c5e5689c0..c39d5f8a91c 100644
--- a/gaming/apiv1/gamingpb/game_server_clusters_service.pb.go
+++ b/gaming/apiv1/gamingpb/game_server_clusters_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/game_server_clusters_service.proto
 
 package gamingpb
diff --git a/gaming/apiv1/gamingpb/game_server_configs.pb.go b/gaming/apiv1/gamingpb/game_server_configs.pb.go
index 53bf4bf85c0..28f22519c57 100644
--- a/gaming/apiv1/gamingpb/game_server_configs.pb.go
+++ b/gaming/apiv1/gamingpb/game_server_configs.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/game_server_configs.proto
 
 package gamingpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -514,9 +514,9 @@ type GameServerConfig struct {
 	// `projects/my-project/locations/global/gameServerDeployments/my-game/configs/my-config`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The labels associated with this game server config. Each label is a
 	// key-value pair.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -568,14 +568,14 @@ func (x *GameServerConfig) GetName() string {
 	return ""
 }
 
-func (x *GameServerConfig) GetCreateTime() *timestamp.Timestamp {
+func (x *GameServerConfig) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *GameServerConfig) GetUpdateTime() *timestamp.Timestamp {
+func (x *GameServerConfig) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -774,7 +774,7 @@ var file_google_cloud_gaming_v1_game_server_configs_proto_goTypes = []interface{
 	nil,                                   // 8: google.cloud.gaming.v1.GameServerConfig.LabelsEntry
 	(*LabelSelector)(nil),                 // 9: google.cloud.gaming.v1.LabelSelector
 	(*Schedule)(nil),                      // 10: google.cloud.gaming.v1.Schedule
-	(*timestamp.Timestamp)(nil),           // 11: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),         // 11: google.protobuf.Timestamp
 }
 var file_google_cloud_gaming_v1_game_server_configs_proto_depIdxs = []int32{
 	7,  // 0: google.cloud.gaming.v1.ListGameServerConfigsResponse.game_server_configs:type_name -> google.cloud.gaming.v1.GameServerConfig
diff --git a/gaming/apiv1/gamingpb/game_server_configs_service.pb.go b/gaming/apiv1/gamingpb/game_server_configs_service.pb.go
index 25a8db17860..9fd6ec3d726 100644
--- a/gaming/apiv1/gamingpb/game_server_configs_service.pb.go
+++ b/gaming/apiv1/gamingpb/game_server_configs_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/game_server_configs_service.proto
 
 package gamingpb
diff --git a/gaming/apiv1/gamingpb/game_server_deployments.pb.go b/gaming/apiv1/gamingpb/game_server_deployments.pb.go
index 99c3e50ab5c..35f5ee49f19 100644
--- a/gaming/apiv1/gamingpb/game_server_deployments.pb.go
+++ b/gaming/apiv1/gamingpb/game_server_deployments.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/game_server_deployments.proto
 
 package gamingpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -430,7 +430,7 @@ type UpdateGameServerDeploymentRequest struct {
 	// Required. Mask of fields to update. At least one path must be supplied in
 	// this field. For the `FieldMask` definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateGameServerDeploymentRequest) Reset() {
@@ -472,7 +472,7 @@ func (x *UpdateGameServerDeploymentRequest) GetGameServerDeployment() *GameServe
 	return nil
 }
 
-func (x *UpdateGameServerDeploymentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateGameServerDeploymentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -492,7 +492,7 @@ type UpdateGameServerDeploymentRolloutRequest struct {
 	// Required. Mask of fields to update. At least one path must be supplied in
 	// this field. For the `FieldMask` definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateGameServerDeploymentRolloutRequest) Reset() {
@@ -534,7 +534,7 @@ func (x *UpdateGameServerDeploymentRolloutRequest) GetRollout() *GameServerDeplo
 	return nil
 }
 
-func (x *UpdateGameServerDeploymentRolloutRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateGameServerDeploymentRolloutRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -661,9 +661,9 @@ type GameServerDeployment struct {
 	// `projects/my-project/locations/global/gameServerDeployments/my-deployment`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The labels associated with this game server deployment. Each label is a
 	// key-value pair.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -712,14 +712,14 @@ func (x *GameServerDeployment) GetName() string {
 	return ""
 }
 
-func (x *GameServerDeployment) GetCreateTime() *timestamp.Timestamp {
+func (x *GameServerDeployment) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *GameServerDeployment) GetUpdateTime() *timestamp.Timestamp {
+func (x *GameServerDeployment) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -863,9 +863,9 @@ type GameServerDeploymentRollout struct {
 	// `projects/my-project/locations/global/gameServerDeployments/my-deployment/rollout`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The default game server config is applied to all realms unless overridden
 	// in the rollout. For example,
 	// `projects/my-project/locations/global/gameServerDeployments/my-game/configs/my-config`.
@@ -917,14 +917,14 @@ func (x *GameServerDeploymentRollout) GetName() string {
 	return ""
 }
 
-func (x *GameServerDeploymentRollout) GetCreateTime() *timestamp.Timestamp {
+func (x *GameServerDeploymentRollout) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *GameServerDeploymentRollout) GetUpdateTime() *timestamp.Timestamp {
+func (x *GameServerDeploymentRollout) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -964,10 +964,10 @@ type PreviewGameServerDeploymentRolloutRequest struct {
 	// Optional. Mask of fields to update. At least one path must be supplied in
 	// this field. For the `FieldMask` definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. The target timestamp to compute the preview. Defaults to the immediately
 	// after the proposed rollout completes.
-	PreviewTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
+	PreviewTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
 }
 
 func (x *PreviewGameServerDeploymentRolloutRequest) Reset() {
@@ -1009,14 +1009,14 @@ func (x *PreviewGameServerDeploymentRolloutRequest) GetRollout() *GameServerDepl
 	return nil
 }
 
-func (x *PreviewGameServerDeploymentRolloutRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *PreviewGameServerDeploymentRolloutRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
 	return nil
 }
 
-func (x *PreviewGameServerDeploymentRolloutRequest) GetPreviewTime() *timestamp.Timestamp {
+func (x *PreviewGameServerDeploymentRolloutRequest) GetPreviewTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PreviewTime
 	}
@@ -1425,12 +1425,12 @@ var file_google_cloud_gaming_v1_game_server_deployments_proto_goTypes = []interf
 	(*PreviewGameServerDeploymentRolloutRequest)(nil),         // 13: google.cloud.gaming.v1.PreviewGameServerDeploymentRolloutRequest
 	(*PreviewGameServerDeploymentRolloutResponse)(nil),        // 14: google.cloud.gaming.v1.PreviewGameServerDeploymentRolloutResponse
 	(*FetchDeploymentStateResponse_DeployedClusterState)(nil), // 15: google.cloud.gaming.v1.FetchDeploymentStateResponse.DeployedClusterState
-	nil,                          // 16: google.cloud.gaming.v1.GameServerDeployment.LabelsEntry
-	(*field_mask.FieldMask)(nil), // 17: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),  // 18: google.protobuf.Timestamp
-	(*RealmSelector)(nil),        // 19: google.cloud.gaming.v1.RealmSelector
-	(*TargetState)(nil),          // 20: google.cloud.gaming.v1.TargetState
-	(*DeployedFleetDetails)(nil), // 21: google.cloud.gaming.v1.DeployedFleetDetails
+	nil,                           // 16: google.cloud.gaming.v1.GameServerDeployment.LabelsEntry
+	(*fieldmaskpb.FieldMask)(nil), // 17: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil), // 18: google.protobuf.Timestamp
+	(*RealmSelector)(nil),         // 19: google.cloud.gaming.v1.RealmSelector
+	(*TargetState)(nil),           // 20: google.cloud.gaming.v1.TargetState
+	(*DeployedFleetDetails)(nil),  // 21: google.cloud.gaming.v1.DeployedFleetDetails
 }
 var file_google_cloud_gaming_v1_game_server_deployments_proto_depIdxs = []int32{
 	10, // 0: google.cloud.gaming.v1.ListGameServerDeploymentsResponse.game_server_deployments:type_name -> google.cloud.gaming.v1.GameServerDeployment
diff --git a/gaming/apiv1/gamingpb/game_server_deployments_service.pb.go b/gaming/apiv1/gamingpb/game_server_deployments_service.pb.go
index 2ad47f72190..ce779b16626 100644
--- a/gaming/apiv1/gamingpb/game_server_deployments_service.pb.go
+++ b/gaming/apiv1/gamingpb/game_server_deployments_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/game_server_deployments_service.proto
 
 package gamingpb
diff --git a/gaming/apiv1/gamingpb/realms.pb.go b/gaming/apiv1/gamingpb/realms.pb.go
index 0634ec07ce7..a60ded3e88b 100644
--- a/gaming/apiv1/gamingpb/realms.pb.go
+++ b/gaming/apiv1/gamingpb/realms.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/realms.proto
 
 package gamingpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -378,7 +378,7 @@ type UpdateRealmRequest struct {
 	// Required. The update mask applies to the resource. For the `FieldMask`
 	// definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateRealmRequest) Reset() {
@@ -420,7 +420,7 @@ func (x *UpdateRealmRequest) GetRealm() *Realm {
 	return nil
 }
 
-func (x *UpdateRealmRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateRealmRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -439,9 +439,9 @@ type PreviewRealmUpdateRequest struct {
 	// Required. The update mask applies to the resource. For the `FieldMask`
 	// definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. The target timestamp to compute the preview.
-	PreviewTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
+	PreviewTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=preview_time,json=previewTime,proto3" json:"preview_time,omitempty"`
 }
 
 func (x *PreviewRealmUpdateRequest) Reset() {
@@ -483,14 +483,14 @@ func (x *PreviewRealmUpdateRequest) GetRealm() *Realm {
 	return nil
 }
 
-func (x *PreviewRealmUpdateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *PreviewRealmUpdateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
 	return nil
 }
 
-func (x *PreviewRealmUpdateRequest) GetPreviewTime() *timestamp.Timestamp {
+func (x *PreviewRealmUpdateRequest) GetPreviewTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PreviewTime
 	}
@@ -566,9 +566,9 @@ type Realm struct {
 	// example, `projects/my-project/locations/{location}/realms/my-realm`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The labels associated with this realm. Each label is a key-value pair.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. Time zone where all policies targeting this realm are evaluated. The value
@@ -620,14 +620,14 @@ func (x *Realm) GetName() string {
 	return ""
 }
 
-func (x *Realm) GetCreateTime() *timestamp.Timestamp {
+func (x *Realm) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Realm) GetUpdateTime() *timestamp.Timestamp {
+func (x *Realm) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -817,8 +817,8 @@ var file_google_cloud_gaming_v1_realms_proto_goTypes = []interface{}{
 	(*PreviewRealmUpdateResponse)(nil), // 7: google.cloud.gaming.v1.PreviewRealmUpdateResponse
 	(*Realm)(nil),                      // 8: google.cloud.gaming.v1.Realm
 	nil,                                // 9: google.cloud.gaming.v1.Realm.LabelsEntry
-	(*field_mask.FieldMask)(nil),       // 10: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),        // 11: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),      // 10: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),      // 11: google.protobuf.Timestamp
 	(*TargetState)(nil),                // 12: google.cloud.gaming.v1.TargetState
 }
 var file_google_cloud_gaming_v1_realms_proto_depIdxs = []int32{
diff --git a/gaming/apiv1/gamingpb/realms_service.pb.go b/gaming/apiv1/gamingpb/realms_service.pb.go
index f45b4580151..1c5a8c1eddb 100644
--- a/gaming/apiv1/gamingpb/realms_service.pb.go
+++ b/gaming/apiv1/gamingpb/realms_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gaming/v1/realms_service.proto
 
 package gamingpb
diff --git a/gaming/apiv1/realms_client.go b/gaming/apiv1/realms_client.go
index 6eef75d69b5..2d459629641 100644
--- a/gaming/apiv1/realms_client.go
+++ b/gaming/apiv1/realms_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/gaming/apiv1/realms_client_example_test.go b/gaming/apiv1/realms_client_example_test.go
index 5fc52f95728..2cf727811a2 100644
--- a/gaming/apiv1/realms_client_example_test.go
+++ b/gaming/apiv1/realms_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"google.golang.org/api/iterator"
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 )
 
 func ExampleNewRealmsClient() {
@@ -56,7 +56,7 @@ func ExampleRealmsClient_ListRealms() {
 
 	req := &gamingpb.ListRealmsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListRealmsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListRealmsRequest.
 	}
 	it := c.ListRealms(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleRealmsClient_GetRealm() {
 
 	req := &gamingpb.GetRealmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetRealmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetRealmRequest.
 	}
 	resp, err := c.GetRealm(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleRealmsClient_CreateRealm() {
 
 	req := &gamingpb.CreateRealmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#CreateRealmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#CreateRealmRequest.
 	}
 	op, err := c.CreateRealm(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleRealmsClient_DeleteRealm() {
 
 	req := &gamingpb.DeleteRealmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#DeleteRealmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#DeleteRealmRequest.
 	}
 	op, err := c.DeleteRealm(ctx, req)
 	if err != nil {
@@ -170,7 +170,7 @@ func ExampleRealmsClient_UpdateRealm() {
 
 	req := &gamingpb.UpdateRealmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#UpdateRealmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#UpdateRealmRequest.
 	}
 	op, err := c.UpdateRealm(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleRealmsClient_PreviewRealmUpdate() {
 
 	req := &gamingpb.PreviewRealmUpdateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewRealmUpdateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewRealmUpdateRequest.
 	}
 	resp, err := c.PreviewRealmUpdate(ctx, req)
 	if err != nil {
diff --git a/gaming/go.mod b/gaming/go.mod
index 04484d7e902..80bb5aa5195 100644
--- a/gaming/go.mod
+++ b/gaming/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/gaming
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/gaming/go.sum b/gaming/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/gaming/go.sum
+++ b/gaming/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/gkebackup/aliasshim/aliasshim.go b/gkebackup/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/gkebackup/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/gkebackup/apiv1/backup_forgke_client.go b/gkebackup/apiv1/backup_forgke_client.go
index 751fa03d03a..250fcbf635c 100644
--- a/gkebackup/apiv1/backup_forgke_client.go
+++ b/gkebackup/apiv1/backup_forgke_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/gkebackup/apiv1/backup_forgke_client_example_test.go b/gkebackup/apiv1/backup_forgke_client_example_test.go
index b01c0a7244a..6a0d1f98935 100644
--- a/gkebackup/apiv1/backup_forgke_client_example_test.go
+++ b/gkebackup/apiv1/backup_forgke_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 	"google.golang.org/api/iterator"
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
 )
 
 func ExampleNewBackupForGKEClient() {
@@ -56,7 +56,7 @@ func ExampleBackupForGKEClient_CreateBackupPlan() {
 
 	req := &gkebackuppb.CreateBackupPlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateBackupPlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateBackupPlanRequest.
 	}
 	op, err := c.CreateBackupPlan(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleBackupForGKEClient_ListBackupPlans() {
 
 	req := &gkebackuppb.ListBackupPlansRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListBackupPlansRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListBackupPlansRequest.
 	}
 	it := c.ListBackupPlans(ctx, req)
 	for {
@@ -117,7 +117,7 @@ func ExampleBackupForGKEClient_GetBackupPlan() {
 
 	req := &gkebackuppb.GetBackupPlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetBackupPlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetBackupPlanRequest.
 	}
 	resp, err := c.GetBackupPlan(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleBackupForGKEClient_UpdateBackupPlan() {
 
 	req := &gkebackuppb.UpdateBackupPlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#UpdateBackupPlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#UpdateBackupPlanRequest.
 	}
 	op, err := c.UpdateBackupPlan(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleBackupForGKEClient_DeleteBackupPlan() {
 
 	req := &gkebackuppb.DeleteBackupPlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#DeleteBackupPlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#DeleteBackupPlanRequest.
 	}
 	op, err := c.DeleteBackupPlan(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleBackupForGKEClient_CreateBackup() {
 
 	req := &gkebackuppb.CreateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateBackupRequest.
 	}
 	op, err := c.CreateBackup(ctx, req)
 	if err != nil {
@@ -230,7 +230,7 @@ func ExampleBackupForGKEClient_ListBackups() {
 
 	req := &gkebackuppb.ListBackupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListBackupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListBackupsRequest.
 	}
 	it := c.ListBackups(ctx, req)
 	for {
@@ -261,7 +261,7 @@ func ExampleBackupForGKEClient_GetBackup() {
 
 	req := &gkebackuppb.GetBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetBackupRequest.
 	}
 	resp, err := c.GetBackup(ctx, req)
 	if err != nil {
@@ -286,7 +286,7 @@ func ExampleBackupForGKEClient_UpdateBackup() {
 
 	req := &gkebackuppb.UpdateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#UpdateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#UpdateBackupRequest.
 	}
 	op, err := c.UpdateBackup(ctx, req)
 	if err != nil {
@@ -316,7 +316,7 @@ func ExampleBackupForGKEClient_DeleteBackup() {
 
 	req := &gkebackuppb.DeleteBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#DeleteBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#DeleteBackupRequest.
 	}
 	op, err := c.DeleteBackup(ctx, req)
 	if err != nil {
@@ -344,7 +344,7 @@ func ExampleBackupForGKEClient_ListVolumeBackups() {
 
 	req := &gkebackuppb.ListVolumeBackupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListVolumeBackupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListVolumeBackupsRequest.
 	}
 	it := c.ListVolumeBackups(ctx, req)
 	for {
@@ -375,7 +375,7 @@ func ExampleBackupForGKEClient_GetVolumeBackup() {
 
 	req := &gkebackuppb.GetVolumeBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetVolumeBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetVolumeBackupRequest.
 	}
 	resp, err := c.GetVolumeBackup(ctx, req)
 	if err != nil {
@@ -400,7 +400,7 @@ func ExampleBackupForGKEClient_CreateRestorePlan() {
 
 	req := &gkebackuppb.CreateRestorePlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateRestorePlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateRestorePlanRequest.
 	}
 	op, err := c.CreateRestorePlan(ctx, req)
 	if err != nil {
@@ -430,7 +430,7 @@ func ExampleBackupForGKEClient_ListRestorePlans() {
 
 	req := &gkebackuppb.ListRestorePlansRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListRestorePlansRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListRestorePlansRequest.
 	}
 	it := c.ListRestorePlans(ctx, req)
 	for {
@@ -461,7 +461,7 @@ func ExampleBackupForGKEClient_GetRestorePlan() {
 
 	req := &gkebackuppb.GetRestorePlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetRestorePlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetRestorePlanRequest.
 	}
 	resp, err := c.GetRestorePlan(ctx, req)
 	if err != nil {
@@ -486,7 +486,7 @@ func ExampleBackupForGKEClient_UpdateRestorePlan() {
 
 	req := &gkebackuppb.UpdateRestorePlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#UpdateRestorePlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#UpdateRestorePlanRequest.
 	}
 	op, err := c.UpdateRestorePlan(ctx, req)
 	if err != nil {
@@ -516,7 +516,7 @@ func ExampleBackupForGKEClient_DeleteRestorePlan() {
 
 	req := &gkebackuppb.DeleteRestorePlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#DeleteRestorePlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#DeleteRestorePlanRequest.
 	}
 	op, err := c.DeleteRestorePlan(ctx, req)
 	if err != nil {
@@ -544,7 +544,7 @@ func ExampleBackupForGKEClient_CreateRestore() {
 
 	req := &gkebackuppb.CreateRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateRestoreRequest.
 	}
 	op, err := c.CreateRestore(ctx, req)
 	if err != nil {
@@ -574,7 +574,7 @@ func ExampleBackupForGKEClient_ListRestores() {
 
 	req := &gkebackuppb.ListRestoresRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListRestoresRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListRestoresRequest.
 	}
 	it := c.ListRestores(ctx, req)
 	for {
@@ -605,7 +605,7 @@ func ExampleBackupForGKEClient_GetRestore() {
 
 	req := &gkebackuppb.GetRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetRestoreRequest.
 	}
 	resp, err := c.GetRestore(ctx, req)
 	if err != nil {
@@ -630,7 +630,7 @@ func ExampleBackupForGKEClient_UpdateRestore() {
 
 	req := &gkebackuppb.UpdateRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#UpdateRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#UpdateRestoreRequest.
 	}
 	op, err := c.UpdateRestore(ctx, req)
 	if err != nil {
@@ -660,7 +660,7 @@ func ExampleBackupForGKEClient_DeleteRestore() {
 
 	req := &gkebackuppb.DeleteRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#DeleteRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#DeleteRestoreRequest.
 	}
 	op, err := c.DeleteRestore(ctx, req)
 	if err != nil {
@@ -688,7 +688,7 @@ func ExampleBackupForGKEClient_ListVolumeRestores() {
 
 	req := &gkebackuppb.ListVolumeRestoresRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListVolumeRestoresRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListVolumeRestoresRequest.
 	}
 	it := c.ListVolumeRestores(ctx, req)
 	for {
@@ -719,7 +719,7 @@ func ExampleBackupForGKEClient_GetVolumeRestore() {
 
 	req := &gkebackuppb.GetVolumeRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetVolumeRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetVolumeRestoreRequest.
 	}
 	resp, err := c.GetVolumeRestore(ctx, req)
 	if err != nil {
diff --git a/gkebackup/apiv1/doc.go b/gkebackup/apiv1/doc.go
index a4037a4e498..7818566e984 100644
--- a/gkebackup/apiv1/doc.go
+++ b/gkebackup/apiv1/doc.go
@@ -60,7 +60,7 @@
 //
 //	req := &gkebackuppb.CreateBackupPlanRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateBackupPlanRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateBackupPlanRequest.
 //	}
 //	op, err := c.CreateBackupPlan(ctx, req)
 //	if err != nil {
diff --git a/gkebackup/apiv1/gkebackuppb/backup.pb.go b/gkebackup/apiv1/gkebackuppb/backup.pb.go
index f9024b6e9c9..3f8720c522f 100644
--- a/gkebackup/apiv1/gkebackuppb/backup.pb.go
+++ b/gkebackup/apiv1/gkebackuppb/backup.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkebackup/v1/backup.proto
 
 package gkebackuppb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -122,9 +122,9 @@ type Backup struct {
 	// [UUID4](https://en.wikipedia.org/wiki/Universally_unique_identifier)
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The timestamp when this Backup resource was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The timestamp when this Backup resource was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. This flag indicates whether this Backup resource was created manually
 	// by a user or via a schedule in the BackupPlan. A value of True means that
 	// the Backup was created manually.
@@ -144,7 +144,7 @@ type Backup struct {
 	DeleteLockDays int32 `protobuf:"varint,7,opt,name=delete_lock_days,json=deleteLockDays,proto3" json:"delete_lock_days,omitempty"`
 	// Output only. The time at which an existing delete lock will expire for this backup
 	// (calculated from create_time + [delete_lock_days][google.cloud.gkebackup.v1.Backup.delete_lock_days]).
-	DeleteLockExpireTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=delete_lock_expire_time,json=deleteLockExpireTime,proto3" json:"delete_lock_expire_time,omitempty"`
+	DeleteLockExpireTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=delete_lock_expire_time,json=deleteLockExpireTime,proto3" json:"delete_lock_expire_time,omitempty"`
 	// The age (in days) after which this Backup will be automatically deleted.
 	// Must be an integer value >= 0:
 	//
@@ -158,7 +158,7 @@ type Backup struct {
 	RetainDays int32 `protobuf:"varint,9,opt,name=retain_days,json=retainDays,proto3" json:"retain_days,omitempty"`
 	// Output only. The time at which this Backup will be automatically deleted (calculated
 	// from create_time + [retain_days][google.cloud.gkebackup.v1.Backup.retain_days]).
-	RetainExpireTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=retain_expire_time,json=retainExpireTime,proto3" json:"retain_expire_time,omitempty"`
+	RetainExpireTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=retain_expire_time,json=retainExpireTime,proto3" json:"retain_expire_time,omitempty"`
 	// Output only. The customer managed encryption key that was used to encrypt the Backup's
 	// artifacts.  Inherited from the parent BackupPlan's
 	// [encryption_key][google.cloud.gkebackup.v1.BackupPlan.BackupConfig.encryption_key] value.
@@ -188,7 +188,7 @@ type Backup struct {
 	// Output only. Human-readable description of why the backup is in the current `state`.
 	StateReason string `protobuf:"bytes,19,opt,name=state_reason,json=stateReason,proto3" json:"state_reason,omitempty"`
 	// Output only. Completion time of the Backup
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,20,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,20,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 	// Output only. The total number of Kubernetes resources included in the Backup.
 	ResourceCount int32 `protobuf:"varint,21,opt,name=resource_count,json=resourceCount,proto3" json:"resource_count,omitempty"`
 	// Output only. The total number of volume backups contained in the Backup.
@@ -259,14 +259,14 @@ func (x *Backup) GetUid() string {
 	return ""
 }
 
-func (x *Backup) GetCreateTime() *timestamp.Timestamp {
+func (x *Backup) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Backup) GetUpdateTime() *timestamp.Timestamp {
+func (x *Backup) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -294,7 +294,7 @@ func (x *Backup) GetDeleteLockDays() int32 {
 	return 0
 }
 
-func (x *Backup) GetDeleteLockExpireTime() *timestamp.Timestamp {
+func (x *Backup) GetDeleteLockExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeleteLockExpireTime
 	}
@@ -308,7 +308,7 @@ func (x *Backup) GetRetainDays() int32 {
 	return 0
 }
 
-func (x *Backup) GetRetainExpireTime() *timestamp.Timestamp {
+func (x *Backup) GetRetainExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RetainExpireTime
 	}
@@ -385,7 +385,7 @@ func (x *Backup) GetStateReason() string {
 	return ""
 }
 
-func (x *Backup) GetCompleteTime() *timestamp.Timestamp {
+func (x *Backup) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -775,7 +775,7 @@ var file_google_cloud_gkebackup_v1_backup_proto_goTypes = []interface{}{
 	(*Backup_ClusterMetadata)(nil), // 2: google.cloud.gkebackup.v1.Backup.ClusterMetadata
 	nil,                            // 3: google.cloud.gkebackup.v1.Backup.LabelsEntry
 	nil,                            // 4: google.cloud.gkebackup.v1.Backup.ClusterMetadata.BackupCrdVersionsEntry
-	(*timestamp.Timestamp)(nil),    // 5: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),  // 5: google.protobuf.Timestamp
 	(*EncryptionKey)(nil),          // 6: google.cloud.gkebackup.v1.EncryptionKey
 	(*Namespaces)(nil),             // 7: google.cloud.gkebackup.v1.Namespaces
 	(*NamespacedNames)(nil),        // 8: google.cloud.gkebackup.v1.NamespacedNames
diff --git a/gkebackup/apiv1/gkebackuppb/backup_plan.pb.go b/gkebackup/apiv1/gkebackuppb/backup_plan.pb.go
index 215f18bd354..9fdf3eeb35c 100644
--- a/gkebackup/apiv1/gkebackuppb/backup_plan.pb.go
+++ b/gkebackup/apiv1/gkebackuppb/backup_plan.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkebackup/v1/backup_plan.proto
 
 package gkebackuppb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -50,10 +50,10 @@ type BackupPlan struct {
 	// [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier) format.
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The timestamp when this BackupPlan resource was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The timestamp when this BackupPlan resource was last
 	// updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// User specified descriptive string for this BackupPlan.
 	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Required. Immutable. The source cluster from which Backups will be created via
@@ -139,14 +139,14 @@ func (x *BackupPlan) GetUid() string {
 	return ""
 }
 
-func (x *BackupPlan) GetCreateTime() *timestamp.Timestamp {
+func (x *BackupPlan) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *BackupPlan) GetUpdateTime() *timestamp.Timestamp {
+func (x *BackupPlan) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -664,7 +664,7 @@ var file_google_cloud_gkebackup_v1_backup_plan_proto_goTypes = []interface{}{
 	(*BackupPlan_Schedule)(nil),        // 2: google.cloud.gkebackup.v1.BackupPlan.Schedule
 	(*BackupPlan_BackupConfig)(nil),    // 3: google.cloud.gkebackup.v1.BackupPlan.BackupConfig
 	nil,                                // 4: google.cloud.gkebackup.v1.BackupPlan.LabelsEntry
-	(*timestamp.Timestamp)(nil),        // 5: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),      // 5: google.protobuf.Timestamp
 	(*Namespaces)(nil),                 // 6: google.cloud.gkebackup.v1.Namespaces
 	(*NamespacedNames)(nil),            // 7: google.cloud.gkebackup.v1.NamespacedNames
 	(*EncryptionKey)(nil),              // 8: google.cloud.gkebackup.v1.EncryptionKey
diff --git a/gkebackup/apiv1/gkebackuppb/common.pb.go b/gkebackup/apiv1/gkebackuppb/common.pb.go
index 3c00adae510..12f5483a6b9 100644
--- a/gkebackup/apiv1/gkebackuppb/common.pb.go
+++ b/gkebackup/apiv1/gkebackuppb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkebackup/v1/common.proto
 
 package gkebackuppb
diff --git a/gkebackup/apiv1/gkebackuppb/gkebackup.pb.go b/gkebackup/apiv1/gkebackuppb/gkebackup.pb.go
index 5cc58594bb8..7924a686d4e 100644
--- a/gkebackup/apiv1/gkebackuppb/gkebackup.pb.go
+++ b/gkebackup/apiv1/gkebackuppb/gkebackup.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkebackup/v1/gkebackup.proto
 
 package gkebackuppb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -50,9 +50,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -100,14 +100,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_gkebackup_v1_gkebackup_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -459,7 +459,7 @@ type UpdateBackupPlanRequest struct {
 	// written to the target BackupPlan resource.
 	// Note that OUTPUT_ONLY and IMMUTABLE fields in `backup_plan` are ignored
 	// and are not used to update the target BackupPlan.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateBackupPlanRequest) Reset() {
@@ -501,7 +501,7 @@ func (x *UpdateBackupPlanRequest) GetBackupPlan() *BackupPlan {
 	return nil
 }
 
-func (x *UpdateBackupPlanRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateBackupPlanRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -867,7 +867,7 @@ type UpdateBackupRequest struct {
 	// written to the target Backup resource.
 	// Note that OUTPUT_ONLY and IMMUTABLE fields in `backup` are ignored
 	// and are not used to update the target Backup.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateBackupRequest) Reset() {
@@ -909,7 +909,7 @@ func (x *UpdateBackupRequest) GetBackup() *Backup {
 	return nil
 }
 
-func (x *UpdateBackupRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateBackupRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1505,7 +1505,7 @@ type UpdateRestorePlanRequest struct {
 	// written to the target RestorePlan resource.
 	// Note that OUTPUT_ONLY and IMMUTABLE fields in `restore_plan` are ignored
 	// and are not used to update the target RestorePlan.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateRestorePlanRequest) Reset() {
@@ -1547,7 +1547,7 @@ func (x *UpdateRestorePlanRequest) GetRestorePlan() *RestorePlan {
 	return nil
 }
 
-func (x *UpdateRestorePlanRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateRestorePlanRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1934,7 +1934,7 @@ type UpdateRestoreRequest struct {
 	// written to the target Restore resource.
 	// Note that OUTPUT_ONLY and IMMUTABLE fields in `restore` are ignored
 	// and are not used to update the target Restore.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateRestoreRequest) Reset() {
@@ -1976,7 +1976,7 @@ func (x *UpdateRestoreRequest) GetRestore() *Restore {
 	return nil
 }
 
-func (x *UpdateRestoreRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateRestoreRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3010,9 +3010,9 @@ var file_google_cloud_gkebackup_v1_gkebackup_proto_goTypes = []interface{}{
 	(*ListVolumeRestoresRequest)(nil),  // 28: google.cloud.gkebackup.v1.ListVolumeRestoresRequest
 	(*ListVolumeRestoresResponse)(nil), // 29: google.cloud.gkebackup.v1.ListVolumeRestoresResponse
 	(*GetVolumeRestoreRequest)(nil),    // 30: google.cloud.gkebackup.v1.GetVolumeRestoreRequest
-	(*timestamp.Timestamp)(nil),        // 31: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),      // 31: google.protobuf.Timestamp
 	(*BackupPlan)(nil),                 // 32: google.cloud.gkebackup.v1.BackupPlan
-	(*field_mask.FieldMask)(nil),       // 33: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),      // 33: google.protobuf.FieldMask
 	(*Backup)(nil),                     // 34: google.cloud.gkebackup.v1.Backup
 	(*VolumeBackup)(nil),               // 35: google.cloud.gkebackup.v1.VolumeBackup
 	(*RestorePlan)(nil),                // 36: google.cloud.gkebackup.v1.RestorePlan
diff --git a/gkebackup/apiv1/gkebackuppb/restore.pb.go b/gkebackup/apiv1/gkebackuppb/restore.pb.go
index 40edafdc6bc..138ae8354a5 100644
--- a/gkebackup/apiv1/gkebackuppb/restore.pb.go
+++ b/gkebackup/apiv1/gkebackuppb/restore.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkebackup/v1/restore.proto
 
 package gkebackuppb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -305,10 +305,10 @@ type Restore struct {
 	// [UUID](https://en.wikipedia.org/wiki/Universally_unique_identifier) format.
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The timestamp when this Restore resource was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The timestamp when this Restore resource was last
 	// updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// User specified descriptive string for this Restore.
 	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Required. Immutable. A reference to the [Backup][google.cloud.gkebackup.v1.Backup] used as the source from which this Restore
@@ -334,7 +334,7 @@ type Restore struct {
 	// Output only. Human-readable description of why the Restore is in its current state.
 	StateReason string `protobuf:"bytes,11,opt,name=state_reason,json=stateReason,proto3" json:"state_reason,omitempty"`
 	// Output only. Timestamp of when the restore operation completed.
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 	// Output only. Number of resources restored during the restore execution.
 	ResourcesRestoredCount int32 `protobuf:"varint,13,opt,name=resources_restored_count,json=resourcesRestoredCount,proto3" json:"resources_restored_count,omitempty"`
 	// Output only. Number of resources excluded during the restore execution.
@@ -401,14 +401,14 @@ func (x *Restore) GetUid() string {
 	return ""
 }
 
-func (x *Restore) GetCreateTime() *timestamp.Timestamp {
+func (x *Restore) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Restore) GetUpdateTime() *timestamp.Timestamp {
+func (x *Restore) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -464,7 +464,7 @@ func (x *Restore) GetStateReason() string {
 	return ""
 }
 
-func (x *Restore) GetCompleteTime() *timestamp.Timestamp {
+func (x *Restore) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -1153,7 +1153,7 @@ var file_google_cloud_gkebackup_v1_restore_proto_goTypes = []interface{}{
 	(*RestoreConfig_GroupKind)(nil),                   // 7: google.cloud.gkebackup.v1.RestoreConfig.GroupKind
 	(*RestoreConfig_ClusterResourceRestoreScope)(nil), // 8: google.cloud.gkebackup.v1.RestoreConfig.ClusterResourceRestoreScope
 	(*RestoreConfig_SubstitutionRule)(nil),            // 9: google.cloud.gkebackup.v1.RestoreConfig.SubstitutionRule
-	(*timestamp.Timestamp)(nil),                       // 10: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                     // 10: google.protobuf.Timestamp
 	(*Namespaces)(nil),                                // 11: google.cloud.gkebackup.v1.Namespaces
 	(*NamespacedNames)(nil),                           // 12: google.cloud.gkebackup.v1.NamespacedNames
 }
diff --git a/gkebackup/apiv1/gkebackuppb/restore_plan.pb.go b/gkebackup/apiv1/gkebackuppb/restore_plan.pb.go
index 271f10b69c5..1f914e3c405 100644
--- a/gkebackup/apiv1/gkebackuppb/restore_plan.pb.go
+++ b/gkebackup/apiv1/gkebackuppb/restore_plan.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkebackup/v1/restore_plan.proto
 
 package gkebackuppb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -53,10 +53,10 @@ type RestorePlan struct {
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The timestamp when this RestorePlan resource was
 	// created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The timestamp when this RestorePlan resource was last
 	// updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// User specified descriptive string for this RestorePlan.
 	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Required. Immutable. A reference to the [BackupPlan][google.cloud.gkebackup.v1.BackupPlan] from which Backups may be used as the
@@ -132,14 +132,14 @@ func (x *RestorePlan) GetUid() string {
 	return ""
 }
 
-func (x *RestorePlan) GetCreateTime() *timestamp.Timestamp {
+func (x *RestorePlan) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *RestorePlan) GetUpdateTime() *timestamp.Timestamp {
+func (x *RestorePlan) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -280,10 +280,10 @@ func file_google_cloud_gkebackup_v1_restore_plan_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_gkebackup_v1_restore_plan_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_cloud_gkebackup_v1_restore_plan_proto_goTypes = []interface{}{
-	(*RestorePlan)(nil),         // 0: google.cloud.gkebackup.v1.RestorePlan
-	nil,                         // 1: google.cloud.gkebackup.v1.RestorePlan.LabelsEntry
-	(*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp
-	(*RestoreConfig)(nil),       // 3: google.cloud.gkebackup.v1.RestoreConfig
+	(*RestorePlan)(nil),           // 0: google.cloud.gkebackup.v1.RestorePlan
+	nil,                           // 1: google.cloud.gkebackup.v1.RestorePlan.LabelsEntry
+	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
+	(*RestoreConfig)(nil),         // 3: google.cloud.gkebackup.v1.RestoreConfig
 }
 var file_google_cloud_gkebackup_v1_restore_plan_proto_depIdxs = []int32{
 	2, // 0: google.cloud.gkebackup.v1.RestorePlan.create_time:type_name -> google.protobuf.Timestamp
diff --git a/gkebackup/apiv1/gkebackuppb/volume.pb.go b/gkebackup/apiv1/gkebackuppb/volume.pb.go
index 896494a251e..371bd8239e6 100644
--- a/gkebackup/apiv1/gkebackuppb/volume.pb.go
+++ b/gkebackup/apiv1/gkebackuppb/volume.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkebackup/v1/volume.proto
 
 package gkebackuppb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -293,10 +293,10 @@ type VolumeBackup struct {
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The timestamp when this VolumeBackup resource was
 	// created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The timestamp when this VolumeBackup resource was last
 	// updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. A reference to the source Kubernetes PVC from which this VolumeBackup
 	// was created.
 	SourcePvc *NamespacedName `protobuf:"bytes,5,opt,name=source_pvc,json=sourcePvc,proto3" json:"source_pvc,omitempty"`
@@ -314,7 +314,7 @@ type VolumeBackup struct {
 	DiskSizeBytes int64 `protobuf:"varint,9,opt,name=disk_size_bytes,json=diskSizeBytes,proto3" json:"disk_size_bytes,omitempty"`
 	// Output only. The timestamp when the associated underlying volume backup
 	// operation completed.
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 	// Output only. The current state of this VolumeBackup.
 	State VolumeBackup_State `protobuf:"varint,11,opt,name=state,proto3,enum=google.cloud.gkebackup.v1.VolumeBackup_State" json:"state,omitempty"`
 	// Output only. A human readable message explaining why the VolumeBackup is in its current
@@ -374,14 +374,14 @@ func (x *VolumeBackup) GetUid() string {
 	return ""
 }
 
-func (x *VolumeBackup) GetCreateTime() *timestamp.Timestamp {
+func (x *VolumeBackup) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *VolumeBackup) GetUpdateTime() *timestamp.Timestamp {
+func (x *VolumeBackup) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -423,7 +423,7 @@ func (x *VolumeBackup) GetDiskSizeBytes() int64 {
 	return 0
 }
 
-func (x *VolumeBackup) GetCompleteTime() *timestamp.Timestamp {
+func (x *VolumeBackup) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -466,10 +466,10 @@ type VolumeRestore struct {
 	Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The timestamp when this VolumeRestore resource was
 	// created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The timestamp when this VolumeRestore resource was last
 	// updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The full name of the VolumeBackup from which the volume will be restored.
 	// Format: projects/*/locations/*/backupPlans/*/backups/*/volumeBackups/*.
 	VolumeBackup string `protobuf:"bytes,5,opt,name=volume_backup,json=volumeBackup,proto3" json:"volume_backup,omitempty"`
@@ -482,7 +482,7 @@ type VolumeRestore struct {
 	VolumeType VolumeRestore_VolumeType `protobuf:"varint,8,opt,name=volume_type,json=volumeType,proto3,enum=google.cloud.gkebackup.v1.VolumeRestore_VolumeType" json:"volume_type,omitempty"`
 	// Output only. The timestamp when the associated underlying volume
 	// restoration completed.
-	CompleteTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
+	CompleteTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=complete_time,json=completeTime,proto3" json:"complete_time,omitempty"`
 	// Output only. The current state of this VolumeRestore.
 	State VolumeRestore_State `protobuf:"varint,10,opt,name=state,proto3,enum=google.cloud.gkebackup.v1.VolumeRestore_State" json:"state,omitempty"`
 	// Output only. A human readable message explaining why the VolumeRestore is in its
@@ -542,14 +542,14 @@ func (x *VolumeRestore) GetUid() string {
 	return ""
 }
 
-func (x *VolumeRestore) GetCreateTime() *timestamp.Timestamp {
+func (x *VolumeRestore) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *VolumeRestore) GetUpdateTime() *timestamp.Timestamp {
+func (x *VolumeRestore) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -584,7 +584,7 @@ func (x *VolumeRestore) GetVolumeType() VolumeRestore_VolumeType {
 	return VolumeRestore_VOLUME_TYPE_UNSPECIFIED
 }
 
-func (x *VolumeRestore) GetCompleteTime() *timestamp.Timestamp {
+func (x *VolumeRestore) GetCompleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CompleteTime
 	}
@@ -794,7 +794,7 @@ var file_google_cloud_gkebackup_v1_volume_proto_goTypes = []interface{}{
 	(VolumeRestore_State)(0),             // 3: google.cloud.gkebackup.v1.VolumeRestore.State
 	(*VolumeBackup)(nil),                 // 4: google.cloud.gkebackup.v1.VolumeBackup
 	(*VolumeRestore)(nil),                // 5: google.cloud.gkebackup.v1.VolumeRestore
-	(*timestamp.Timestamp)(nil),          // 6: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),        // 6: google.protobuf.Timestamp
 	(*NamespacedName)(nil),               // 7: google.cloud.gkebackup.v1.NamespacedName
 }
 var file_google_cloud_gkebackup_v1_volume_proto_depIdxs = []int32{
diff --git a/gkebackup/go.mod b/gkebackup/go.mod
index 9eb69198a84..d26fba4d22b 100644
--- a/gkebackup/go.mod
+++ b/gkebackup/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/gkebackup
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/gkebackup/go.sum b/gkebackup/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/gkebackup/go.sum
+++ b/gkebackup/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/gkemulticloud/aliasshim/aliasshim.go b/gkemulticloud/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/gkemulticloud/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/gkemulticloud/apiv1/aws_clusters_client.go b/gkemulticloud/apiv1/aws_clusters_client.go
index bb3995d06fd..fd7f2aefcd0 100644
--- a/gkemulticloud/apiv1/aws_clusters_client.go
+++ b/gkemulticloud/apiv1/aws_clusters_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/gkemulticloud/apiv1/aws_clusters_client_example_test.go b/gkemulticloud/apiv1/aws_clusters_client_example_test.go
index 07ce21bb766..10203a5fb42 100644
--- a/gkemulticloud/apiv1/aws_clusters_client_example_test.go
+++ b/gkemulticloud/apiv1/aws_clusters_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"google.golang.org/api/iterator"
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 )
 
 func ExampleNewAwsClustersClient() {
@@ -56,7 +56,7 @@ func ExampleAwsClustersClient_CreateAwsCluster() {
 
 	req := &gkemulticloudpb.CreateAwsClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAwsClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAwsClusterRequest.
 	}
 	op, err := c.CreateAwsCluster(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleAwsClustersClient_UpdateAwsCluster() {
 
 	req := &gkemulticloudpb.UpdateAwsClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#UpdateAwsClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#UpdateAwsClusterRequest.
 	}
 	op, err := c.UpdateAwsCluster(ctx, req)
 	if err != nil {
@@ -116,7 +116,7 @@ func ExampleAwsClustersClient_GetAwsCluster() {
 
 	req := &gkemulticloudpb.GetAwsClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAwsClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAwsClusterRequest.
 	}
 	resp, err := c.GetAwsCluster(ctx, req)
 	if err != nil {
@@ -141,7 +141,7 @@ func ExampleAwsClustersClient_ListAwsClusters() {
 
 	req := &gkemulticloudpb.ListAwsClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAwsClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAwsClustersRequest.
 	}
 	it := c.ListAwsClusters(ctx, req)
 	for {
@@ -172,7 +172,7 @@ func ExampleAwsClustersClient_DeleteAwsCluster() {
 
 	req := &gkemulticloudpb.DeleteAwsClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAwsClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAwsClusterRequest.
 	}
 	op, err := c.DeleteAwsCluster(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleAwsClustersClient_GenerateAwsAccessToken() {
 
 	req := &gkemulticloudpb.GenerateAwsAccessTokenRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GenerateAwsAccessTokenRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GenerateAwsAccessTokenRequest.
 	}
 	resp, err := c.GenerateAwsAccessToken(ctx, req)
 	if err != nil {
@@ -225,7 +225,7 @@ func ExampleAwsClustersClient_CreateAwsNodePool() {
 
 	req := &gkemulticloudpb.CreateAwsNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAwsNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAwsNodePoolRequest.
 	}
 	op, err := c.CreateAwsNodePool(ctx, req)
 	if err != nil {
@@ -255,7 +255,7 @@ func ExampleAwsClustersClient_UpdateAwsNodePool() {
 
 	req := &gkemulticloudpb.UpdateAwsNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#UpdateAwsNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#UpdateAwsNodePoolRequest.
 	}
 	op, err := c.UpdateAwsNodePool(ctx, req)
 	if err != nil {
@@ -285,7 +285,7 @@ func ExampleAwsClustersClient_GetAwsNodePool() {
 
 	req := &gkemulticloudpb.GetAwsNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAwsNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAwsNodePoolRequest.
 	}
 	resp, err := c.GetAwsNodePool(ctx, req)
 	if err != nil {
@@ -310,7 +310,7 @@ func ExampleAwsClustersClient_ListAwsNodePools() {
 
 	req := &gkemulticloudpb.ListAwsNodePoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAwsNodePoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAwsNodePoolsRequest.
 	}
 	it := c.ListAwsNodePools(ctx, req)
 	for {
@@ -341,7 +341,7 @@ func ExampleAwsClustersClient_DeleteAwsNodePool() {
 
 	req := &gkemulticloudpb.DeleteAwsNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAwsNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAwsNodePoolRequest.
 	}
 	op, err := c.DeleteAwsNodePool(ctx, req)
 	if err != nil {
@@ -369,7 +369,7 @@ func ExampleAwsClustersClient_GetAwsServerConfig() {
 
 	req := &gkemulticloudpb.GetAwsServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAwsServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAwsServerConfigRequest.
 	}
 	resp, err := c.GetAwsServerConfig(ctx, req)
 	if err != nil {
diff --git a/gkemulticloud/apiv1/azure_clusters_client.go b/gkemulticloud/apiv1/azure_clusters_client.go
index 97bc3c2c3df..db7c18e666d 100644
--- a/gkemulticloud/apiv1/azure_clusters_client.go
+++ b/gkemulticloud/apiv1/azure_clusters_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/gkemulticloud/apiv1/azure_clusters_client_example_test.go b/gkemulticloud/apiv1/azure_clusters_client_example_test.go
index 03e69ce838f..4f02de31bda 100644
--- a/gkemulticloud/apiv1/azure_clusters_client_example_test.go
+++ b/gkemulticloud/apiv1/azure_clusters_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"google.golang.org/api/iterator"
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 )
 
 func ExampleNewAzureClustersClient() {
@@ -56,7 +56,7 @@ func ExampleAzureClustersClient_CreateAzureClient() {
 
 	req := &gkemulticloudpb.CreateAzureClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAzureClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAzureClientRequest.
 	}
 	op, err := c.CreateAzureClient(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleAzureClustersClient_GetAzureClient() {
 
 	req := &gkemulticloudpb.GetAzureClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAzureClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAzureClientRequest.
 	}
 	resp, err := c.GetAzureClient(ctx, req)
 	if err != nil {
@@ -111,7 +111,7 @@ func ExampleAzureClustersClient_ListAzureClients() {
 
 	req := &gkemulticloudpb.ListAzureClientsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAzureClientsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAzureClientsRequest.
 	}
 	it := c.ListAzureClients(ctx, req)
 	for {
@@ -142,7 +142,7 @@ func ExampleAzureClustersClient_DeleteAzureClient() {
 
 	req := &gkemulticloudpb.DeleteAzureClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAzureClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAzureClientRequest.
 	}
 	op, err := c.DeleteAzureClient(ctx, req)
 	if err != nil {
@@ -170,7 +170,7 @@ func ExampleAzureClustersClient_CreateAzureCluster() {
 
 	req := &gkemulticloudpb.CreateAzureClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAzureClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAzureClusterRequest.
 	}
 	op, err := c.CreateAzureCluster(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleAzureClustersClient_UpdateAzureCluster() {
 
 	req := &gkemulticloudpb.UpdateAzureClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#UpdateAzureClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#UpdateAzureClusterRequest.
 	}
 	op, err := c.UpdateAzureCluster(ctx, req)
 	if err != nil {
@@ -230,7 +230,7 @@ func ExampleAzureClustersClient_GetAzureCluster() {
 
 	req := &gkemulticloudpb.GetAzureClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAzureClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAzureClusterRequest.
 	}
 	resp, err := c.GetAzureCluster(ctx, req)
 	if err != nil {
@@ -255,7 +255,7 @@ func ExampleAzureClustersClient_ListAzureClusters() {
 
 	req := &gkemulticloudpb.ListAzureClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAzureClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAzureClustersRequest.
 	}
 	it := c.ListAzureClusters(ctx, req)
 	for {
@@ -286,7 +286,7 @@ func ExampleAzureClustersClient_DeleteAzureCluster() {
 
 	req := &gkemulticloudpb.DeleteAzureClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAzureClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAzureClusterRequest.
 	}
 	op, err := c.DeleteAzureCluster(ctx, req)
 	if err != nil {
@@ -314,7 +314,7 @@ func ExampleAzureClustersClient_GenerateAzureAccessToken() {
 
 	req := &gkemulticloudpb.GenerateAzureAccessTokenRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GenerateAzureAccessTokenRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GenerateAzureAccessTokenRequest.
 	}
 	resp, err := c.GenerateAzureAccessToken(ctx, req)
 	if err != nil {
@@ -339,7 +339,7 @@ func ExampleAzureClustersClient_CreateAzureNodePool() {
 
 	req := &gkemulticloudpb.CreateAzureNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAzureNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAzureNodePoolRequest.
 	}
 	op, err := c.CreateAzureNodePool(ctx, req)
 	if err != nil {
@@ -369,7 +369,7 @@ func ExampleAzureClustersClient_UpdateAzureNodePool() {
 
 	req := &gkemulticloudpb.UpdateAzureNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#UpdateAzureNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#UpdateAzureNodePoolRequest.
 	}
 	op, err := c.UpdateAzureNodePool(ctx, req)
 	if err != nil {
@@ -399,7 +399,7 @@ func ExampleAzureClustersClient_GetAzureNodePool() {
 
 	req := &gkemulticloudpb.GetAzureNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAzureNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAzureNodePoolRequest.
 	}
 	resp, err := c.GetAzureNodePool(ctx, req)
 	if err != nil {
@@ -424,7 +424,7 @@ func ExampleAzureClustersClient_ListAzureNodePools() {
 
 	req := &gkemulticloudpb.ListAzureNodePoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAzureNodePoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAzureNodePoolsRequest.
 	}
 	it := c.ListAzureNodePools(ctx, req)
 	for {
@@ -455,7 +455,7 @@ func ExampleAzureClustersClient_DeleteAzureNodePool() {
 
 	req := &gkemulticloudpb.DeleteAzureNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAzureNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAzureNodePoolRequest.
 	}
 	op, err := c.DeleteAzureNodePool(ctx, req)
 	if err != nil {
@@ -483,7 +483,7 @@ func ExampleAzureClustersClient_GetAzureServerConfig() {
 
 	req := &gkemulticloudpb.GetAzureServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAzureServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAzureServerConfigRequest.
 	}
 	resp, err := c.GetAzureServerConfig(ctx, req)
 	if err != nil {
diff --git a/gkemulticloud/apiv1/doc.go b/gkemulticloud/apiv1/doc.go
index a60364c6318..958043ce799 100644
--- a/gkemulticloud/apiv1/doc.go
+++ b/gkemulticloud/apiv1/doc.go
@@ -65,7 +65,7 @@
 //
 //	req := &gkemulticloudpb.CreateAwsClusterRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAwsClusterRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAwsClusterRequest.
 //	}
 //	op, err := c.CreateAwsCluster(ctx, req)
 //	if err != nil {
diff --git a/gkemulticloud/apiv1/gkemulticloudpb/aws_resources.pb.go b/gkemulticloud/apiv1/gkemulticloudpb/aws_resources.pb.go
index 431de1696e7..d0131f13cb4 100644
--- a/gkemulticloud/apiv1/gkemulticloudpb/aws_resources.pb.go
+++ b/gkemulticloud/apiv1/gkemulticloudpb/aws_resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkemulticloud/v1/aws_resources.proto
 
 package gkemulticloudpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -334,9 +334,9 @@ type AwsCluster struct {
 	// Output only. If set, there are currently changes in flight to the cluster.
 	Reconciling bool `protobuf:"varint,10,opt,name=reconciling,proto3" json:"reconciling,omitempty"`
 	// Output only. The time at which this cluster was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this cluster was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Allows clients to perform consistent read-modify-writes
 	// through optimistic concurrency control.
 	//
@@ -465,14 +465,14 @@ func (x *AwsCluster) GetReconciling() bool {
 	return false
 }
 
-func (x *AwsCluster) GetCreateTime() *timestamp.Timestamp {
+func (x *AwsCluster) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AwsCluster) GetUpdateTime() *timestamp.Timestamp {
+func (x *AwsCluster) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1129,9 +1129,9 @@ type AwsNodePool struct {
 	// pool.
 	Reconciling bool `protobuf:"varint,18,opt,name=reconciling,proto3" json:"reconciling,omitempty"`
 	// Output only. The time at which this node pool was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,19,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,19,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this node pool was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,20,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,20,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Allows clients to perform consistent read-modify-writes
 	// through optimistic concurrency control.
 	//
@@ -1241,14 +1241,14 @@ func (x *AwsNodePool) GetReconciling() bool {
 	return false
 }
 
-func (x *AwsNodePool) GetCreateTime() *timestamp.Timestamp {
+func (x *AwsNodePool) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AwsNodePool) GetUpdateTime() *timestamp.Timestamp {
+func (x *AwsNodePool) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2302,7 +2302,7 @@ var file_google_cloud_gkemulticloud_v1_aws_resources_proto_goTypes = []interface
 	nil,                               // 23: google.cloud.gkemulticloud.v1.AwsNodePool.AnnotationsEntry
 	nil,                               // 24: google.cloud.gkemulticloud.v1.AwsNodeConfig.LabelsEntry
 	nil,                               // 25: google.cloud.gkemulticloud.v1.AwsNodeConfig.TagsEntry
-	(*timestamp.Timestamp)(nil),       // 26: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),     // 26: google.protobuf.Timestamp
 	(*WorkloadIdentityConfig)(nil),    // 27: google.cloud.gkemulticloud.v1.WorkloadIdentityConfig
 	(*Fleet)(nil),                     // 28: google.cloud.gkemulticloud.v1.Fleet
 	(*LoggingConfig)(nil),             // 29: google.cloud.gkemulticloud.v1.LoggingConfig
diff --git a/gkemulticloud/apiv1/gkemulticloudpb/aws_service.pb.go b/gkemulticloud/apiv1/gkemulticloudpb/aws_service.pb.go
index 99478d720ab..ea785eb7a3f 100644
--- a/gkemulticloud/apiv1/gkemulticloudpb/aws_service.pb.go
+++ b/gkemulticloud/apiv1/gkemulticloudpb/aws_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkemulticloud/v1/aws_service.proto
 
 package gkemulticloudpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -166,7 +166,7 @@ type UpdateAwsClusterRequest struct {
 	//   - `control_plane.ssh_config.ec2_key_pair`.
 	//   - `control_plane.instance_placement.tenancy`.
 	//   - `logging_config`.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAwsClusterRequest) Reset() {
@@ -215,7 +215,7 @@ func (x *UpdateAwsClusterRequest) GetValidateOnly() bool {
 	return false
 }
 
-func (x *UpdateAwsClusterRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAwsClusterRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -627,7 +627,7 @@ type UpdateAwsNodePoolRequest struct {
 	//   - `config.proxy_config.secret_version`.
 	//   - `config.ssh_config`.
 	//   - `config.ssh_config.ec2_key_pair`.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAwsNodePoolRequest) Reset() {
@@ -676,7 +676,7 @@ func (x *UpdateAwsNodePoolRequest) GetValidateOnly() bool {
 	return false
 }
 
-func (x *UpdateAwsNodePoolRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAwsNodePoolRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1089,7 +1089,7 @@ type GenerateAwsAccessTokenResponse struct {
 	// Output only. Access token to authenticate to k8s api-server.
 	AccessToken string `protobuf:"bytes,1,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
 	// Output only. Timestamp at which the token will expire.
-	ExpirationTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
+	ExpirationTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
 }
 
 func (x *GenerateAwsAccessTokenResponse) Reset() {
@@ -1131,7 +1131,7 @@ func (x *GenerateAwsAccessTokenResponse) GetAccessToken() string {
 	return ""
 }
 
-func (x *GenerateAwsAccessTokenResponse) GetExpirationTime() *timestamp.Timestamp {
+func (x *GenerateAwsAccessTokenResponse) GetExpirationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpirationTime
 	}
@@ -1544,9 +1544,9 @@ var file_google_cloud_gkemulticloud_v1_aws_service_proto_goTypes = []interface{}
 	(*GenerateAwsAccessTokenRequest)(nil),  // 13: google.cloud.gkemulticloud.v1.GenerateAwsAccessTokenRequest
 	(*GenerateAwsAccessTokenResponse)(nil), // 14: google.cloud.gkemulticloud.v1.GenerateAwsAccessTokenResponse
 	(*AwsCluster)(nil),                     // 15: google.cloud.gkemulticloud.v1.AwsCluster
-	(*field_mask.FieldMask)(nil),           // 16: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),          // 16: google.protobuf.FieldMask
 	(*AwsNodePool)(nil),                    // 17: google.cloud.gkemulticloud.v1.AwsNodePool
-	(*timestamp.Timestamp)(nil),            // 18: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 18: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),          // 19: google.longrunning.Operation
 	(*AwsServerConfig)(nil),                // 20: google.cloud.gkemulticloud.v1.AwsServerConfig
 }
diff --git a/gkemulticloud/apiv1/gkemulticloudpb/azure_resources.pb.go b/gkemulticloud/apiv1/gkemulticloudpb/azure_resources.pb.go
index 61088e45f56..7bd642220eb 100644
--- a/gkemulticloud/apiv1/gkemulticloudpb/azure_resources.pb.go
+++ b/gkemulticloud/apiv1/gkemulticloudpb/azure_resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkemulticloud/v1/azure_resources.proto
 
 package gkemulticloudpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -237,9 +237,9 @@ type AzureCluster struct {
 	// Output only. If set, there are currently changes in flight to the cluster.
 	Reconciling bool `protobuf:"varint,10,opt,name=reconciling,proto3" json:"reconciling,omitempty"`
 	// Output only. The time at which this cluster was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this cluster was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Allows clients to perform consistent read-modify-writes
 	// through optimistic concurrency control.
 	//
@@ -384,14 +384,14 @@ func (x *AzureCluster) GetReconciling() bool {
 	return false
 }
 
-func (x *AzureCluster) GetCreateTime() *timestamp.Timestamp {
+func (x *AzureCluster) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AzureCluster) GetUpdateTime() *timestamp.Timestamp {
+func (x *AzureCluster) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1077,7 +1077,7 @@ type AzureClient struct {
 	// Output only. A globally unique identifier for the client.
 	Uid string `protobuf:"bytes,5,opt,name=uid,proto3" json:"uid,omitempty"`
 	// Output only. The time at which this resource was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *AzureClient) Reset() {
@@ -1154,7 +1154,7 @@ func (x *AzureClient) GetUid() string {
 	return ""
 }
 
-func (x *AzureClient) GetCreateTime() *timestamp.Timestamp {
+func (x *AzureClient) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1295,9 +1295,9 @@ type AzureNodePool struct {
 	// pool.
 	Reconciling bool `protobuf:"varint,9,opt,name=reconciling,proto3" json:"reconciling,omitempty"`
 	// Output only. The time at which this node pool was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this node pool was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Allows clients to perform consistent read-modify-writes
 	// through optimistic concurrency control.
 	//
@@ -1411,14 +1411,14 @@ func (x *AzureNodePool) GetReconciling() bool {
 	return false
 }
 
-func (x *AzureNodePool) GetCreateTime() *timestamp.Timestamp {
+func (x *AzureNodePool) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AzureNodePool) GetUpdateTime() *timestamp.Timestamp {
+func (x *AzureNodePool) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2385,7 +2385,7 @@ var file_google_cloud_gkemulticloud_v1_azure_resources_proto_goTypes = []interfa
 	nil,                              // 23: google.cloud.gkemulticloud.v1.AzureNodePool.AnnotationsEntry
 	nil,                              // 24: google.cloud.gkemulticloud.v1.AzureNodeConfig.TagsEntry
 	nil,                              // 25: google.cloud.gkemulticloud.v1.AzureNodeConfig.LabelsEntry
-	(*timestamp.Timestamp)(nil),      // 26: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),    // 26: google.protobuf.Timestamp
 	(*WorkloadIdentityConfig)(nil),   // 27: google.cloud.gkemulticloud.v1.WorkloadIdentityConfig
 	(*Fleet)(nil),                    // 28: google.cloud.gkemulticloud.v1.Fleet
 	(*LoggingConfig)(nil),            // 29: google.cloud.gkemulticloud.v1.LoggingConfig
diff --git a/gkemulticloud/apiv1/gkemulticloudpb/azure_service.pb.go b/gkemulticloud/apiv1/gkemulticloudpb/azure_service.pb.go
index 9a246e80fee..fefe7fdd002 100644
--- a/gkemulticloud/apiv1/gkemulticloudpb/azure_service.pb.go
+++ b/gkemulticloud/apiv1/gkemulticloudpb/azure_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkemulticloud/v1/azure_service.proto
 
 package gkemulticloudpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -154,7 +154,7 @@ type UpdateAzureClusterRequest struct {
 	//   - `authorization.admin_users`.
 	//   - `control_plane.root_volume.size_gib`.
 	//   - `logging_config`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAzureClusterRequest) Reset() {
@@ -203,7 +203,7 @@ func (x *UpdateAzureClusterRequest) GetValidateOnly() bool {
 	return false
 }
 
-func (x *UpdateAzureClusterRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAzureClusterRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -604,7 +604,7 @@ type UpdateAzureNodePoolRequest struct {
 	//	*   `autoscaling.min_node_count`.
 	//	*   `autoscaling.max_node_count`.
 	//	*   `config.vm_size`.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAzureNodePoolRequest) Reset() {
@@ -653,7 +653,7 @@ func (x *UpdateAzureNodePoolRequest) GetValidateOnly() bool {
 	return false
 }
 
-func (x *UpdateAzureNodePoolRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAzureNodePoolRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1427,7 +1427,7 @@ type GenerateAzureAccessTokenResponse struct {
 	// Output only. Access token to authenticate to k8s api-server.
 	AccessToken string `protobuf:"bytes,1,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
 	// Output only. Timestamp at which the token will expire.
-	ExpirationTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
+	ExpirationTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
 }
 
 func (x *GenerateAzureAccessTokenResponse) Reset() {
@@ -1469,7 +1469,7 @@ func (x *GenerateAzureAccessTokenResponse) GetAccessToken() string {
 	return ""
 }
 
-func (x *GenerateAzureAccessTokenResponse) GetExpirationTime() *timestamp.Timestamp {
+func (x *GenerateAzureAccessTokenResponse) GetExpirationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpirationTime
 	}
@@ -2008,10 +2008,10 @@ var file_google_cloud_gkemulticloud_v1_azure_service_proto_goTypes = []interface
 	(*GenerateAzureAccessTokenRequest)(nil),  // 18: google.cloud.gkemulticloud.v1.GenerateAzureAccessTokenRequest
 	(*GenerateAzureAccessTokenResponse)(nil), // 19: google.cloud.gkemulticloud.v1.GenerateAzureAccessTokenResponse
 	(*AzureCluster)(nil),                     // 20: google.cloud.gkemulticloud.v1.AzureCluster
-	(*field_mask.FieldMask)(nil),             // 21: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),            // 21: google.protobuf.FieldMask
 	(*AzureNodePool)(nil),                    // 22: google.cloud.gkemulticloud.v1.AzureNodePool
 	(*AzureClient)(nil),                      // 23: google.cloud.gkemulticloud.v1.AzureClient
-	(*timestamp.Timestamp)(nil),              // 24: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),            // 24: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),            // 25: google.longrunning.Operation
 	(*AzureServerConfig)(nil),                // 26: google.cloud.gkemulticloud.v1.AzureServerConfig
 }
diff --git a/gkemulticloud/apiv1/gkemulticloudpb/common_resources.pb.go b/gkemulticloud/apiv1/gkemulticloudpb/common_resources.pb.go
index dd2413bbbba..64c8b2a5c76 100644
--- a/gkemulticloud/apiv1/gkemulticloudpb/common_resources.pb.go
+++ b/gkemulticloud/apiv1/gkemulticloudpb/common_resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gkemulticloud/v1/common_resources.proto
 
 package gkemulticloudpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -277,9 +277,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time at which this operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this operation was completed.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The name of the resource associated to this operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Human-readable status of the operation, if any.
@@ -320,14 +320,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_gkemulticloud_v1_common_resources_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -715,7 +715,7 @@ var file_google_cloud_gkemulticloud_v1_common_resources_proto_goTypes = []interf
 	(*Fleet)(nil),                         // 6: google.cloud.gkemulticloud.v1.Fleet
 	(*LoggingConfig)(nil),                 // 7: google.cloud.gkemulticloud.v1.LoggingConfig
 	(*LoggingComponentConfig)(nil),        // 8: google.cloud.gkemulticloud.v1.LoggingComponentConfig
-	(*timestamp.Timestamp)(nil),           // 9: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),         // 9: google.protobuf.Timestamp
 }
 var file_google_cloud_gkemulticloud_v1_common_resources_proto_depIdxs = []int32{
 	9, // 0: google.cloud.gkemulticloud.v1.OperationMetadata.create_time:type_name -> google.protobuf.Timestamp
diff --git a/gkemulticloud/go.mod b/gkemulticloud/go.mod
index 7a7b16b233c..4a2aecbd9d5 100644
--- a/gkemulticloud/go.mod
+++ b/gkemulticloud/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/gkemulticloud
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/gkemulticloud/go.sum b/gkemulticloud/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/gkemulticloud/go.sum
+++ b/gkemulticloud/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/go.mod b/go.mod
index 080f246bca2..8b390b0ccdd 100644
--- a/go.mod
+++ b/go.mod
@@ -13,18 +13,18 @@ require (
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
 	google.golang.org/api v0.100.0
-	google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
-	cloud.google.com/go/iam v0.3.0 // indirect
+	cloud.google.com/go/iam v0.6.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/go.sum b/go.sum
index 8635a03d4cb..cf99d6b9a7f 100644
--- a/go.sum
+++ b/go.sum
@@ -1,111 +1,29 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
-cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc=
-cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/iam v0.6.0 h1:nsqQC88kT5Iwlm4MeNGTpfMWddp6NB/UOLFTH6m1QfQ=
+cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 cloud.google.com/go/storage v1.27.0 h1:YOO045NZI9RKfCj1c5A/ZtuuENUc8OAW+gHdGnDgyMQ=
 cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -115,462 +33,93 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ=
 github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
 github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
 golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
-google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
-google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
 google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
 google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
 google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY=
 google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
@@ -582,26 +131,13 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/gsuiteaddons/aliasshim/aliasshim.go b/gsuiteaddons/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/gsuiteaddons/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/gsuiteaddons/apiv1/doc.go b/gsuiteaddons/apiv1/doc.go
index 13ea90c06fa..6b5360132f5 100644
--- a/gsuiteaddons/apiv1/doc.go
+++ b/gsuiteaddons/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &gsuiteaddonspb.GetAuthorizationRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#GetAuthorizationRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#GetAuthorizationRequest.
 //	}
 //	resp, err := c.GetAuthorization(ctx, req)
 //	if err != nil {
diff --git a/gsuiteaddons/apiv1/g_suite_add_ons_client.go b/gsuiteaddons/apiv1/g_suite_add_ons_client.go
index 8e1cffa3183..1fccb1a073b 100644
--- a/gsuiteaddons/apiv1/g_suite_add_ons_client.go
+++ b/gsuiteaddons/apiv1/g_suite_add_ons_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	gsuiteaddonspb "cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	gsuiteaddonspb "google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/gsuiteaddons/apiv1/g_suite_add_ons_client_example_test.go b/gsuiteaddons/apiv1/g_suite_add_ons_client_example_test.go
index 2cb21547bc2..4d217d0a1da 100644
--- a/gsuiteaddons/apiv1/g_suite_add_ons_client_example_test.go
+++ b/gsuiteaddons/apiv1/g_suite_add_ons_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	gsuiteaddons "cloud.google.com/go/gsuiteaddons/apiv1"
+	gsuiteaddonspb "cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb"
 	"google.golang.org/api/iterator"
-	gsuiteaddonspb "google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_GetAuthorization() {
 
 	req := &gsuiteaddonspb.GetAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#GetAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#GetAuthorizationRequest.
 	}
 	resp, err := c.GetAuthorization(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_CreateDeployment() {
 
 	req := &gsuiteaddonspb.CreateDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#CreateDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#CreateDeploymentRequest.
 	}
 	resp, err := c.CreateDeployment(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleClient_ReplaceDeployment() {
 
 	req := &gsuiteaddonspb.ReplaceDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#ReplaceDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#ReplaceDeploymentRequest.
 	}
 	resp, err := c.ReplaceDeployment(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleClient_GetDeployment() {
 
 	req := &gsuiteaddonspb.GetDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#GetDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#GetDeploymentRequest.
 	}
 	resp, err := c.GetDeployment(ctx, req)
 	if err != nil {
@@ -156,7 +156,7 @@ func ExampleClient_ListDeployments() {
 
 	req := &gsuiteaddonspb.ListDeploymentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#ListDeploymentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#ListDeploymentsRequest.
 	}
 	it := c.ListDeployments(ctx, req)
 	for {
@@ -187,7 +187,7 @@ func ExampleClient_DeleteDeployment() {
 
 	req := &gsuiteaddonspb.DeleteDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#DeleteDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#DeleteDeploymentRequest.
 	}
 	err = c.DeleteDeployment(ctx, req)
 	if err != nil {
@@ -210,7 +210,7 @@ func ExampleClient_InstallDeployment() {
 
 	req := &gsuiteaddonspb.InstallDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#InstallDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#InstallDeploymentRequest.
 	}
 	err = c.InstallDeployment(ctx, req)
 	if err != nil {
@@ -233,7 +233,7 @@ func ExampleClient_UninstallDeployment() {
 
 	req := &gsuiteaddonspb.UninstallDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#UninstallDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#UninstallDeploymentRequest.
 	}
 	err = c.UninstallDeployment(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleClient_GetInstallStatus() {
 
 	req := &gsuiteaddonspb.GetInstallStatusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1#GetInstallStatusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb#GetInstallStatusRequest.
 	}
 	resp, err := c.GetInstallStatus(ctx, req)
 	if err != nil {
diff --git a/gsuiteaddons/apiv1/gsuiteaddonspb/gsuiteaddons.pb.go b/gsuiteaddons/apiv1/gsuiteaddonspb/gsuiteaddons.pb.go
index 86a918d39d1..55eea03848f 100644
--- a/gsuiteaddons/apiv1/gsuiteaddonspb/gsuiteaddons.pb.go
+++ b/gsuiteaddons/apiv1/gsuiteaddonspb/gsuiteaddons.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/gsuiteaddons/v1/gsuiteaddons.proto
 
 package gsuiteaddonspb
@@ -25,8 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	_type "google.golang.org/genproto/googleapis/apps/script/type"
 	calendar "google.golang.org/genproto/googleapis/apps/script/type/calendar"
@@ -40,6 +38,8 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -701,7 +701,7 @@ type InstallStatus struct {
 	// Example:  `projects/123/deployments/my_deployment/installStatus`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// True if the deployment is installed for the user
-	Installed *wrappers.BoolValue `protobuf:"bytes,2,opt,name=installed,proto3" json:"installed,omitempty"`
+	Installed *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=installed,proto3" json:"installed,omitempty"`
 }
 
 func (x *InstallStatus) Reset() {
@@ -743,7 +743,7 @@ func (x *InstallStatus) GetName() string {
 	return ""
 }
 
-func (x *InstallStatus) GetInstalled() *wrappers.BoolValue {
+func (x *InstallStatus) GetInstalled() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.Installed
 	}
@@ -1294,7 +1294,7 @@ var file_google_cloud_gsuiteaddons_v1_gsuiteaddons_proto_goTypes = []interface{}
 	(*InstallStatus)(nil),                  // 11: google.cloud.gsuiteaddons.v1.InstallStatus
 	(*Deployment)(nil),                     // 12: google.cloud.gsuiteaddons.v1.Deployment
 	(*AddOns)(nil),                         // 13: google.cloud.gsuiteaddons.v1.AddOns
-	(*wrappers.BoolValue)(nil),             // 14: google.protobuf.BoolValue
+	(*wrapperspb.BoolValue)(nil),           // 14: google.protobuf.BoolValue
 	(*_type.CommonAddOnManifest)(nil),      // 15: google.apps.script.type.CommonAddOnManifest
 	(*gmail.GmailAddOnManifest)(nil),       // 16: google.apps.script.type.gmail.GmailAddOnManifest
 	(*drive.DriveAddOnManifest)(nil),       // 17: google.apps.script.type.drive.DriveAddOnManifest
@@ -1303,7 +1303,7 @@ var file_google_cloud_gsuiteaddons_v1_gsuiteaddons_proto_goTypes = []interface{}
 	(*sheets.SheetsAddOnManifest)(nil),     // 20: google.apps.script.type.sheets.SheetsAddOnManifest
 	(*slides.SlidesAddOnManifest)(nil),     // 21: google.apps.script.type.slides.SlidesAddOnManifest
 	(*_type.HttpOptions)(nil),              // 22: google.apps.script.type.HttpOptions
-	(*empty.Empty)(nil),                    // 23: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                  // 23: google.protobuf.Empty
 }
 var file_google_cloud_gsuiteaddons_v1_gsuiteaddons_proto_depIdxs = []int32{
 	12, // 0: google.cloud.gsuiteaddons.v1.CreateDeploymentRequest.deployment:type_name -> google.cloud.gsuiteaddons.v1.Deployment
@@ -1562,15 +1562,15 @@ type GSuiteAddOnsClient interface {
 	// Lists all deployments in a particular project.
 	ListDeployments(ctx context.Context, in *ListDeploymentsRequest, opts ...grpc.CallOption) (*ListDeploymentsResponse, error)
 	// Deletes the deployment with the given name.
-	DeleteDeployment(ctx context.Context, in *DeleteDeploymentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteDeployment(ctx context.Context, in *DeleteDeploymentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Installs a deployment in developer mode.
 	// See:
 	// https://developers.google.com/gsuite/add-ons/how-tos/testing-gsuite-addons.
-	InstallDeployment(ctx context.Context, in *InstallDeploymentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	InstallDeployment(ctx context.Context, in *InstallDeploymentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Uninstalls a developer mode deployment.
 	// See:
 	// https://developers.google.com/gsuite/add-ons/how-tos/testing-gsuite-addons.
-	UninstallDeployment(ctx context.Context, in *UninstallDeploymentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	UninstallDeployment(ctx context.Context, in *UninstallDeploymentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Fetches the install status of a developer mode deployment.
 	GetInstallStatus(ctx context.Context, in *GetInstallStatusRequest, opts ...grpc.CallOption) (*InstallStatus, error)
 }
@@ -1628,8 +1628,8 @@ func (c *gSuiteAddOnsClient) ListDeployments(ctx context.Context, in *ListDeploy
 	return out, nil
 }
 
-func (c *gSuiteAddOnsClient) DeleteDeployment(ctx context.Context, in *DeleteDeploymentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *gSuiteAddOnsClient) DeleteDeployment(ctx context.Context, in *DeleteDeploymentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.gsuiteaddons.v1.GSuiteAddOns/DeleteDeployment", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1637,8 +1637,8 @@ func (c *gSuiteAddOnsClient) DeleteDeployment(ctx context.Context, in *DeleteDep
 	return out, nil
 }
 
-func (c *gSuiteAddOnsClient) InstallDeployment(ctx context.Context, in *InstallDeploymentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *gSuiteAddOnsClient) InstallDeployment(ctx context.Context, in *InstallDeploymentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.gsuiteaddons.v1.GSuiteAddOns/InstallDeployment", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1646,8 +1646,8 @@ func (c *gSuiteAddOnsClient) InstallDeployment(ctx context.Context, in *InstallD
 	return out, nil
 }
 
-func (c *gSuiteAddOnsClient) UninstallDeployment(ctx context.Context, in *UninstallDeploymentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *gSuiteAddOnsClient) UninstallDeployment(ctx context.Context, in *UninstallDeploymentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.gsuiteaddons.v1.GSuiteAddOns/UninstallDeployment", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1677,15 +1677,15 @@ type GSuiteAddOnsServer interface {
 	// Lists all deployments in a particular project.
 	ListDeployments(context.Context, *ListDeploymentsRequest) (*ListDeploymentsResponse, error)
 	// Deletes the deployment with the given name.
-	DeleteDeployment(context.Context, *DeleteDeploymentRequest) (*empty.Empty, error)
+	DeleteDeployment(context.Context, *DeleteDeploymentRequest) (*emptypb.Empty, error)
 	// Installs a deployment in developer mode.
 	// See:
 	// https://developers.google.com/gsuite/add-ons/how-tos/testing-gsuite-addons.
-	InstallDeployment(context.Context, *InstallDeploymentRequest) (*empty.Empty, error)
+	InstallDeployment(context.Context, *InstallDeploymentRequest) (*emptypb.Empty, error)
 	// Uninstalls a developer mode deployment.
 	// See:
 	// https://developers.google.com/gsuite/add-ons/how-tos/testing-gsuite-addons.
-	UninstallDeployment(context.Context, *UninstallDeploymentRequest) (*empty.Empty, error)
+	UninstallDeployment(context.Context, *UninstallDeploymentRequest) (*emptypb.Empty, error)
 	// Fetches the install status of a developer mode deployment.
 	GetInstallStatus(context.Context, *GetInstallStatusRequest) (*InstallStatus, error)
 }
@@ -1709,13 +1709,13 @@ func (*UnimplementedGSuiteAddOnsServer) GetDeployment(context.Context, *GetDeplo
 func (*UnimplementedGSuiteAddOnsServer) ListDeployments(context.Context, *ListDeploymentsRequest) (*ListDeploymentsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListDeployments not implemented")
 }
-func (*UnimplementedGSuiteAddOnsServer) DeleteDeployment(context.Context, *DeleteDeploymentRequest) (*empty.Empty, error) {
+func (*UnimplementedGSuiteAddOnsServer) DeleteDeployment(context.Context, *DeleteDeploymentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteDeployment not implemented")
 }
-func (*UnimplementedGSuiteAddOnsServer) InstallDeployment(context.Context, *InstallDeploymentRequest) (*empty.Empty, error) {
+func (*UnimplementedGSuiteAddOnsServer) InstallDeployment(context.Context, *InstallDeploymentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method InstallDeployment not implemented")
 }
-func (*UnimplementedGSuiteAddOnsServer) UninstallDeployment(context.Context, *UninstallDeploymentRequest) (*empty.Empty, error) {
+func (*UnimplementedGSuiteAddOnsServer) UninstallDeployment(context.Context, *UninstallDeploymentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UninstallDeployment not implemented")
 }
 func (*UnimplementedGSuiteAddOnsServer) GetInstallStatus(context.Context, *GetInstallStatusRequest) (*InstallStatus, error) {
diff --git a/gsuiteaddons/go.mod b/gsuiteaddons/go.mod
index ca7318b713f..f31dd9b0ee0 100644
--- a/gsuiteaddons/go.mod
+++ b/gsuiteaddons/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/gsuiteaddons
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/gsuiteaddons/go.sum b/gsuiteaddons/go.sum
index 65de5aeb845..b16568229fc 100644
--- a/gsuiteaddons/go.sum
+++ b/gsuiteaddons/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b h1:IOQ/4u8ZSLV+xns0LQxzdAcdOJTDMWB+0shVM8KWXBE=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/iam/aliasshim/aliasshim.go b/iam/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/iam/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/iam/credentials/apiv1/credentialspb/common.pb.go b/iam/credentials/apiv1/credentialspb/common.pb.go
index d9b2344c13c..e1ae395db7c 100644
--- a/iam/credentials/apiv1/credentialspb/common.pb.go
+++ b/iam/credentials/apiv1/credentialspb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/iam/credentials/v1/common.proto
 
 package credentialspb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -68,7 +68,7 @@ type GenerateAccessTokenRequest struct {
 	// Must be set to a value less than or equal to 3600 (1 hour). If a value is
 	// not specified, the token's lifetime will be set to a default value of one
 	// hour.
-	Lifetime *duration.Duration `protobuf:"bytes,7,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
+	Lifetime *durationpb.Duration `protobuf:"bytes,7,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
 }
 
 func (x *GenerateAccessTokenRequest) Reset() {
@@ -124,7 +124,7 @@ func (x *GenerateAccessTokenRequest) GetScope() []string {
 	return nil
 }
 
-func (x *GenerateAccessTokenRequest) GetLifetime() *duration.Duration {
+func (x *GenerateAccessTokenRequest) GetLifetime() *durationpb.Duration {
 	if x != nil {
 		return x.Lifetime
 	}
@@ -140,7 +140,7 @@ type GenerateAccessTokenResponse struct {
 	AccessToken string `protobuf:"bytes,1,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
 	// Token expiration time.
 	// The expiration time is always set.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *GenerateAccessTokenResponse) Reset() {
@@ -182,7 +182,7 @@ func (x *GenerateAccessTokenResponse) GetAccessToken() string {
 	return ""
 }
 
-func (x *GenerateAccessTokenResponse) GetExpireTime() *timestamp.Timestamp {
+func (x *GenerateAccessTokenResponse) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -718,8 +718,8 @@ var file_google_iam_credentials_v1_common_proto_goTypes = []interface{}{
 	(*SignJwtResponse)(nil),             // 5: google.iam.credentials.v1.SignJwtResponse
 	(*GenerateIdTokenRequest)(nil),      // 6: google.iam.credentials.v1.GenerateIdTokenRequest
 	(*GenerateIdTokenResponse)(nil),     // 7: google.iam.credentials.v1.GenerateIdTokenResponse
-	(*duration.Duration)(nil),           // 8: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),         // 9: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),         // 8: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),       // 9: google.protobuf.Timestamp
 }
 var file_google_iam_credentials_v1_common_proto_depIdxs = []int32{
 	8, // 0: google.iam.credentials.v1.GenerateAccessTokenRequest.lifetime:type_name -> google.protobuf.Duration
diff --git a/iam/credentials/apiv1/credentialspb/iamcredentials.pb.go b/iam/credentials/apiv1/credentialspb/iamcredentials.pb.go
index d989c0fa559..d2e20d3095d 100644
--- a/iam/credentials/apiv1/credentialspb/iamcredentials.pb.go
+++ b/iam/credentials/apiv1/credentialspb/iamcredentials.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/iam/credentials/v1/iamcredentials.proto
 
 package credentialspb
diff --git a/iam/credentials/apiv1/doc.go b/iam/credentials/apiv1/doc.go
index 71930417092..cdb90a80fd1 100644
--- a/iam/credentials/apiv1/doc.go
+++ b/iam/credentials/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &credentialspb.GenerateAccessTokenRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/iam/credentials/v1#GenerateAccessTokenRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/iam/credentials/apiv1/credentialspb#GenerateAccessTokenRequest.
 //	}
 //	resp, err := c.GenerateAccessToken(ctx, req)
 //	if err != nil {
diff --git a/iam/credentials/apiv1/iam_credentials_client.go b/iam/credentials/apiv1/iam_credentials_client.go
index bbc6316bc0a..a17679390a4 100644
--- a/iam/credentials/apiv1/iam_credentials_client.go
+++ b/iam/credentials/apiv1/iam_credentials_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	credentialspb "cloud.google.com/go/iam/credentials/apiv1/credentialspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	credentialspb "google.golang.org/genproto/googleapis/iam/credentials/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/iam/credentials/apiv1/iam_credentials_client_example_test.go b/iam/credentials/apiv1/iam_credentials_client_example_test.go
index 9d30f155591..075a494b778 100644
--- a/iam/credentials/apiv1/iam_credentials_client_example_test.go
+++ b/iam/credentials/apiv1/iam_credentials_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	credentials "cloud.google.com/go/iam/credentials/apiv1"
-	credentialspb "google.golang.org/genproto/googleapis/iam/credentials/v1"
+	credentialspb "cloud.google.com/go/iam/credentials/apiv1/credentialspb"
 )
 
 func ExampleNewIamCredentialsClient() {
@@ -55,7 +55,7 @@ func ExampleIamCredentialsClient_GenerateAccessToken() {
 
 	req := &credentialspb.GenerateAccessTokenRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/iam/credentials/v1#GenerateAccessTokenRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iam/credentials/apiv1/credentialspb#GenerateAccessTokenRequest.
 	}
 	resp, err := c.GenerateAccessToken(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleIamCredentialsClient_GenerateIdToken() {
 
 	req := &credentialspb.GenerateIdTokenRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/iam/credentials/v1#GenerateIdTokenRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iam/credentials/apiv1/credentialspb#GenerateIdTokenRequest.
 	}
 	resp, err := c.GenerateIdToken(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleIamCredentialsClient_SignBlob() {
 
 	req := &credentialspb.SignBlobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/iam/credentials/v1#SignBlobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iam/credentials/apiv1/credentialspb#SignBlobRequest.
 	}
 	resp, err := c.SignBlob(ctx, req)
 	if err != nil {
@@ -130,7 +130,7 @@ func ExampleIamCredentialsClient_SignJwt() {
 
 	req := &credentialspb.SignJwtRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/iam/credentials/v1#SignJwtRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iam/credentials/apiv1/credentialspb#SignJwtRequest.
 	}
 	resp, err := c.SignJwt(ctx, req)
 	if err != nil {
diff --git a/iam/go.mod b/iam/go.mod
index 7b81c4de7e4..9a06a8516f3 100644
--- a/iam/go.mod
+++ b/iam/go.mod
@@ -3,11 +3,12 @@ module cloud.google.com/go/iam
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go v0.105.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -18,9 +19,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/iam/go.sum b/iam/go.sum
index 8784b2a0c77..a7c57802950 100644
--- a/iam/go.sum
+++ b/iam/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -39,6 +41,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -62,11 +65,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +82,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +99,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/iap/aliasshim/aliasshim.go b/iap/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/iap/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/iap/apiv1/iappb/service.pb.go b/iap/apiv1/iappb/service.pb.go
index fd6e3f27015..7ddfe9ac01e 100644
--- a/iap/apiv1/iappb/service.pb.go
+++ b/iap/apiv1/iappb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/iap/v1/service.proto
 
 package iappb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	empty "github.com/golang/protobuf/ptypes/empty"
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -483,7 +483,7 @@ type UpdateTunnelDestGroupRequest struct {
 	// A field mask that specifies which IAP settings to update.
 	// If omitted, then all of the settings are updated. See
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateTunnelDestGroupRequest) Reset() {
@@ -525,7 +525,7 @@ func (x *UpdateTunnelDestGroupRequest) GetTunnelDestGroup() *TunnelDestGroup {
 	return nil
 }
 
-func (x *UpdateTunnelDestGroupRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTunnelDestGroupRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -664,7 +664,7 @@ type UpdateIapSettingsRequest struct {
 	// The field mask specifying which IAP settings should be updated.
 	// If omitted, the all of the settings are updated. See
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateIapSettingsRequest) Reset() {
@@ -706,7 +706,7 @@ func (x *UpdateIapSettingsRequest) GetIapSettings() *IapSettings {
 	return nil
 }
 
-func (x *UpdateIapSettingsRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateIapSettingsRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -872,7 +872,7 @@ type GcipSettings struct {
 	// Login page URI associated with the GCIP tenants.
 	// Typically, all resources within the same project share the same login page,
 	// though it could be overridden at the sub resource level.
-	LoginPageUri *wrappers.StringValue `protobuf:"bytes,2,opt,name=login_page_uri,json=loginPageUri,proto3" json:"login_page_uri,omitempty"`
+	LoginPageUri *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=login_page_uri,json=loginPageUri,proto3" json:"login_page_uri,omitempty"`
 }
 
 func (x *GcipSettings) Reset() {
@@ -914,7 +914,7 @@ func (x *GcipSettings) GetTenantIds() []string {
 	return nil
 }
 
-func (x *GcipSettings) GetLoginPageUri() *wrappers.StringValue {
+func (x *GcipSettings) GetLoginPageUri() *wrapperspb.StringValue {
 	if x != nil {
 		return x.LoginPageUri
 	}
@@ -930,7 +930,7 @@ type CorsSettings struct {
 
 	// Configuration to allow HTTP OPTIONS calls to skip authorization. If
 	// undefined, IAP will not apply any special logic to OPTIONS requests.
-	AllowHttpOptions *wrappers.BoolValue `protobuf:"bytes,1,opt,name=allow_http_options,json=allowHttpOptions,proto3" json:"allow_http_options,omitempty"`
+	AllowHttpOptions *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=allow_http_options,json=allowHttpOptions,proto3" json:"allow_http_options,omitempty"`
 }
 
 func (x *CorsSettings) Reset() {
@@ -965,7 +965,7 @@ func (*CorsSettings) Descriptor() ([]byte, []int) {
 	return file_google_cloud_iap_v1_service_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *CorsSettings) GetAllowHttpOptions() *wrappers.BoolValue {
+func (x *CorsSettings) GetAllowHttpOptions() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.AllowHttpOptions
 	}
@@ -984,7 +984,7 @@ type OAuthSettings struct {
 	// https://developers.google.com/identity/protocols/OpenIDConnect#hd-param
 	// Note: IAP does not verify that the id token's hd claim matches this value
 	// since access behavior is managed by IAM policies.
-	LoginHint *wrappers.StringValue `protobuf:"bytes,2,opt,name=login_hint,json=loginHint,proto3" json:"login_hint,omitempty"`
+	LoginHint *wrapperspb.StringValue `protobuf:"bytes,2,opt,name=login_hint,json=loginHint,proto3" json:"login_hint,omitempty"`
 }
 
 func (x *OAuthSettings) Reset() {
@@ -1019,7 +1019,7 @@ func (*OAuthSettings) Descriptor() ([]byte, []int) {
 	return file_google_cloud_iap_v1_service_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *OAuthSettings) GetLoginHint() *wrappers.StringValue {
+func (x *OAuthSettings) GetLoginHint() *wrapperspb.StringValue {
 	if x != nil {
 		return x.LoginHint
 	}
@@ -1036,7 +1036,7 @@ type ReauthSettings struct {
 	Method ReauthSettings_Method `protobuf:"varint,1,opt,name=method,proto3,enum=google.cloud.iap.v1.ReauthSettings_Method" json:"method,omitempty"`
 	// Reauth session lifetime, how long before a user has to reauthenticate
 	// again.
-	MaxAge *duration.Duration `protobuf:"bytes,2,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"`
+	MaxAge *durationpb.Duration `protobuf:"bytes,2,opt,name=max_age,json=maxAge,proto3" json:"max_age,omitempty"`
 	// How IAP determines the effective policy in cases of hierarchial policies.
 	// Policies are merged from higher in the hierarchy to lower in the hierarchy.
 	PolicyType ReauthSettings_PolicyType `protobuf:"varint,3,opt,name=policy_type,json=policyType,proto3,enum=google.cloud.iap.v1.ReauthSettings_PolicyType" json:"policy_type,omitempty"`
@@ -1081,7 +1081,7 @@ func (x *ReauthSettings) GetMethod() ReauthSettings_Method {
 	return ReauthSettings_METHOD_UNSPECIFIED
 }
 
-func (x *ReauthSettings) GetMaxAge() *duration.Duration {
+func (x *ReauthSettings) GetMaxAge() *durationpb.Duration {
 	if x != nil {
 		return x.MaxAge
 	}
@@ -1107,7 +1107,7 @@ type ApplicationSettings struct {
 	AccessDeniedPageSettings *AccessDeniedPageSettings `protobuf:"bytes,2,opt,name=access_denied_page_settings,json=accessDeniedPageSettings,proto3" json:"access_denied_page_settings,omitempty"`
 	// The Domain value to set for cookies generated by IAP. This value is not
 	// validated by the API, but will be ignored at runtime if invalid.
-	CookieDomain *wrappers.StringValue `protobuf:"bytes,3,opt,name=cookie_domain,json=cookieDomain,proto3" json:"cookie_domain,omitempty"`
+	CookieDomain *wrapperspb.StringValue `protobuf:"bytes,3,opt,name=cookie_domain,json=cookieDomain,proto3" json:"cookie_domain,omitempty"`
 }
 
 func (x *ApplicationSettings) Reset() {
@@ -1156,7 +1156,7 @@ func (x *ApplicationSettings) GetAccessDeniedPageSettings() *AccessDeniedPageSet
 	return nil
 }
 
-func (x *ApplicationSettings) GetCookieDomain() *wrappers.StringValue {
+func (x *ApplicationSettings) GetCookieDomain() *wrapperspb.StringValue {
 	if x != nil {
 		return x.CookieDomain
 	}
@@ -1174,7 +1174,7 @@ type CsmSettings struct {
 
 	// Audience claim set in the generated RCToken. This value is not validated by
 	// IAP.
-	RctokenAud *wrappers.StringValue `protobuf:"bytes,1,opt,name=rctoken_aud,json=rctokenAud,proto3" json:"rctoken_aud,omitempty"`
+	RctokenAud *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=rctoken_aud,json=rctokenAud,proto3" json:"rctoken_aud,omitempty"`
 }
 
 func (x *CsmSettings) Reset() {
@@ -1209,7 +1209,7 @@ func (*CsmSettings) Descriptor() ([]byte, []int) {
 	return file_google_cloud_iap_v1_service_proto_rawDescGZIP(), []int{16}
 }
 
-func (x *CsmSettings) GetRctokenAud() *wrappers.StringValue {
+func (x *CsmSettings) GetRctokenAud() *wrapperspb.StringValue {
 	if x != nil {
 		return x.RctokenAud
 	}
@@ -1226,10 +1226,10 @@ type AccessDeniedPageSettings struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The URI to be redirected to when access is denied.
-	AccessDeniedPageUri *wrappers.StringValue `protobuf:"bytes,1,opt,name=access_denied_page_uri,json=accessDeniedPageUri,proto3" json:"access_denied_page_uri,omitempty"`
+	AccessDeniedPageUri *wrapperspb.StringValue `protobuf:"bytes,1,opt,name=access_denied_page_uri,json=accessDeniedPageUri,proto3" json:"access_denied_page_uri,omitempty"`
 	// Whether to generate a troubleshooting URL on access denied events to this
 	// application.
-	GenerateTroubleshootingUri *wrappers.BoolValue `protobuf:"bytes,2,opt,name=generate_troubleshooting_uri,json=generateTroubleshootingUri,proto3" json:"generate_troubleshooting_uri,omitempty"`
+	GenerateTroubleshootingUri *wrapperspb.BoolValue `protobuf:"bytes,2,opt,name=generate_troubleshooting_uri,json=generateTroubleshootingUri,proto3" json:"generate_troubleshooting_uri,omitempty"`
 }
 
 func (x *AccessDeniedPageSettings) Reset() {
@@ -1264,14 +1264,14 @@ func (*AccessDeniedPageSettings) Descriptor() ([]byte, []int) {
 	return file_google_cloud_iap_v1_service_proto_rawDescGZIP(), []int{17}
 }
 
-func (x *AccessDeniedPageSettings) GetAccessDeniedPageUri() *wrappers.StringValue {
+func (x *AccessDeniedPageSettings) GetAccessDeniedPageUri() *wrapperspb.StringValue {
 	if x != nil {
 		return x.AccessDeniedPageUri
 	}
 	return nil
 }
 
-func (x *AccessDeniedPageSettings) GetGenerateTroubleshootingUri() *wrappers.BoolValue {
+func (x *AccessDeniedPageSettings) GetGenerateTroubleshootingUri() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.GenerateTroubleshootingUri
 	}
@@ -2560,16 +2560,16 @@ var file_google_cloud_iap_v1_service_proto_goTypes = []interface{}{
 	(*DeleteIdentityAwareProxyClientRequest)(nil),      // 29: google.cloud.iap.v1.DeleteIdentityAwareProxyClientRequest
 	(*Brand)(nil),                                      // 30: google.cloud.iap.v1.Brand
 	(*IdentityAwareProxyClient)(nil),                   // 31: google.cloud.iap.v1.IdentityAwareProxyClient
-	(*field_mask.FieldMask)(nil),                       // 32: google.protobuf.FieldMask
-	(*wrappers.StringValue)(nil),                       // 33: google.protobuf.StringValue
-	(*wrappers.BoolValue)(nil),                         // 34: google.protobuf.BoolValue
-	(*duration.Duration)(nil),                          // 35: google.protobuf.Duration
+	(*fieldmaskpb.FieldMask)(nil),                      // 32: google.protobuf.FieldMask
+	(*wrapperspb.StringValue)(nil),                     // 33: google.protobuf.StringValue
+	(*wrapperspb.BoolValue)(nil),                       // 34: google.protobuf.BoolValue
+	(*durationpb.Duration)(nil),                        // 35: google.protobuf.Duration
 	(*v1.SetIamPolicyRequest)(nil),                     // 36: google.iam.v1.SetIamPolicyRequest
 	(*v1.GetIamPolicyRequest)(nil),                     // 37: google.iam.v1.GetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),               // 38: google.iam.v1.TestIamPermissionsRequest
 	(*v1.Policy)(nil),                                  // 39: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil),              // 40: google.iam.v1.TestIamPermissionsResponse
-	(*empty.Empty)(nil),                                // 41: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                              // 41: google.protobuf.Empty
 }
 var file_google_cloud_iap_v1_service_proto_depIdxs = []int32{
 	8,  // 0: google.cloud.iap.v1.ListTunnelDestGroupsResponse.tunnel_dest_groups:type_name -> google.cloud.iap.v1.TunnelDestGroup
@@ -3072,7 +3072,7 @@ type IdentityAwareProxyAdminServiceClient interface {
 	// Retrieves an existing TunnelDestGroup.
 	GetTunnelDestGroup(ctx context.Context, in *GetTunnelDestGroupRequest, opts ...grpc.CallOption) (*TunnelDestGroup, error)
 	// Deletes a TunnelDestGroup.
-	DeleteTunnelDestGroup(ctx context.Context, in *DeleteTunnelDestGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTunnelDestGroup(ctx context.Context, in *DeleteTunnelDestGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates a TunnelDestGroup.
 	UpdateTunnelDestGroup(ctx context.Context, in *UpdateTunnelDestGroupRequest, opts ...grpc.CallOption) (*TunnelDestGroup, error)
 }
@@ -3157,8 +3157,8 @@ func (c *identityAwareProxyAdminServiceClient) GetTunnelDestGroup(ctx context.Co
 	return out, nil
 }
 
-func (c *identityAwareProxyAdminServiceClient) DeleteTunnelDestGroup(ctx context.Context, in *DeleteTunnelDestGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *identityAwareProxyAdminServiceClient) DeleteTunnelDestGroup(ctx context.Context, in *DeleteTunnelDestGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.iap.v1.IdentityAwareProxyAdminService/DeleteTunnelDestGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3206,7 +3206,7 @@ type IdentityAwareProxyAdminServiceServer interface {
 	// Retrieves an existing TunnelDestGroup.
 	GetTunnelDestGroup(context.Context, *GetTunnelDestGroupRequest) (*TunnelDestGroup, error)
 	// Deletes a TunnelDestGroup.
-	DeleteTunnelDestGroup(context.Context, *DeleteTunnelDestGroupRequest) (*empty.Empty, error)
+	DeleteTunnelDestGroup(context.Context, *DeleteTunnelDestGroupRequest) (*emptypb.Empty, error)
 	// Updates a TunnelDestGroup.
 	UpdateTunnelDestGroup(context.Context, *UpdateTunnelDestGroupRequest) (*TunnelDestGroup, error)
 }
@@ -3239,7 +3239,7 @@ func (*UnimplementedIdentityAwareProxyAdminServiceServer) CreateTunnelDestGroup(
 func (*UnimplementedIdentityAwareProxyAdminServiceServer) GetTunnelDestGroup(context.Context, *GetTunnelDestGroupRequest) (*TunnelDestGroup, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetTunnelDestGroup not implemented")
 }
-func (*UnimplementedIdentityAwareProxyAdminServiceServer) DeleteTunnelDestGroup(context.Context, *DeleteTunnelDestGroupRequest) (*empty.Empty, error) {
+func (*UnimplementedIdentityAwareProxyAdminServiceServer) DeleteTunnelDestGroup(context.Context, *DeleteTunnelDestGroupRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTunnelDestGroup not implemented")
 }
 func (*UnimplementedIdentityAwareProxyAdminServiceServer) UpdateTunnelDestGroup(context.Context, *UpdateTunnelDestGroupRequest) (*TunnelDestGroup, error) {
@@ -3511,7 +3511,7 @@ type IdentityAwareProxyOAuthServiceClient interface {
 	// Deletes an Identity Aware Proxy (IAP) OAuth client. Useful for removing
 	// obsolete clients, managing the number of clients in a given project, and
 	// cleaning up after tests. Requires that the client is owned by IAP.
-	DeleteIdentityAwareProxyClient(ctx context.Context, in *DeleteIdentityAwareProxyClientRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteIdentityAwareProxyClient(ctx context.Context, in *DeleteIdentityAwareProxyClientRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type identityAwareProxyOAuthServiceClient struct {
@@ -3585,8 +3585,8 @@ func (c *identityAwareProxyOAuthServiceClient) ResetIdentityAwareProxyClientSecr
 	return out, nil
 }
 
-func (c *identityAwareProxyOAuthServiceClient) DeleteIdentityAwareProxyClient(ctx context.Context, in *DeleteIdentityAwareProxyClientRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *identityAwareProxyOAuthServiceClient) DeleteIdentityAwareProxyClient(ctx context.Context, in *DeleteIdentityAwareProxyClientRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.iap.v1.IdentityAwareProxyOAuthService/DeleteIdentityAwareProxyClient", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3624,7 +3624,7 @@ type IdentityAwareProxyOAuthServiceServer interface {
 	// Deletes an Identity Aware Proxy (IAP) OAuth client. Useful for removing
 	// obsolete clients, managing the number of clients in a given project, and
 	// cleaning up after tests. Requires that the client is owned by IAP.
-	DeleteIdentityAwareProxyClient(context.Context, *DeleteIdentityAwareProxyClientRequest) (*empty.Empty, error)
+	DeleteIdentityAwareProxyClient(context.Context, *DeleteIdentityAwareProxyClientRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedIdentityAwareProxyOAuthServiceServer can be embedded to have forward compatible implementations.
@@ -3652,7 +3652,7 @@ func (*UnimplementedIdentityAwareProxyOAuthServiceServer) GetIdentityAwareProxyC
 func (*UnimplementedIdentityAwareProxyOAuthServiceServer) ResetIdentityAwareProxyClientSecret(context.Context, *ResetIdentityAwareProxyClientSecretRequest) (*IdentityAwareProxyClient, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ResetIdentityAwareProxyClientSecret not implemented")
 }
-func (*UnimplementedIdentityAwareProxyOAuthServiceServer) DeleteIdentityAwareProxyClient(context.Context, *DeleteIdentityAwareProxyClientRequest) (*empty.Empty, error) {
+func (*UnimplementedIdentityAwareProxyOAuthServiceServer) DeleteIdentityAwareProxyClient(context.Context, *DeleteIdentityAwareProxyClientRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteIdentityAwareProxyClient not implemented")
 }
 
diff --git a/iap/apiv1/identity_aware_proxy_admin_client.go b/iap/apiv1/identity_aware_proxy_admin_client.go
index 23229deb066..07a2523b664 100644
--- a/iap/apiv1/identity_aware_proxy_admin_client.go
+++ b/iap/apiv1/identity_aware_proxy_admin_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	iappb "cloud.google.com/go/iap/apiv1/iappb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	iappb "google.golang.org/genproto/googleapis/cloud/iap/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/iap/apiv1/identity_aware_proxy_admin_client_example_test.go b/iap/apiv1/identity_aware_proxy_admin_client_example_test.go
index cd4e12e51a0..de2596e5145 100644
--- a/iap/apiv1/identity_aware_proxy_admin_client_example_test.go
+++ b/iap/apiv1/identity_aware_proxy_admin_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	iap "cloud.google.com/go/iap/apiv1"
+	iappb "cloud.google.com/go/iap/apiv1/iappb"
 	"google.golang.org/api/iterator"
-	iappb "google.golang.org/genproto/googleapis/cloud/iap/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -132,7 +132,7 @@ func ExampleIdentityAwareProxyAdminClient_GetIapSettings() {
 
 	req := &iappb.GetIapSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#GetIapSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#GetIapSettingsRequest.
 	}
 	resp, err := c.GetIapSettings(ctx, req)
 	if err != nil {
@@ -157,7 +157,7 @@ func ExampleIdentityAwareProxyAdminClient_UpdateIapSettings() {
 
 	req := &iappb.UpdateIapSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#UpdateIapSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#UpdateIapSettingsRequest.
 	}
 	resp, err := c.UpdateIapSettings(ctx, req)
 	if err != nil {
@@ -182,7 +182,7 @@ func ExampleIdentityAwareProxyAdminClient_ListTunnelDestGroups() {
 
 	req := &iappb.ListTunnelDestGroupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#ListTunnelDestGroupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#ListTunnelDestGroupsRequest.
 	}
 	it := c.ListTunnelDestGroups(ctx, req)
 	for {
@@ -213,7 +213,7 @@ func ExampleIdentityAwareProxyAdminClient_CreateTunnelDestGroup() {
 
 	req := &iappb.CreateTunnelDestGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#CreateTunnelDestGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#CreateTunnelDestGroupRequest.
 	}
 	resp, err := c.CreateTunnelDestGroup(ctx, req)
 	if err != nil {
@@ -238,7 +238,7 @@ func ExampleIdentityAwareProxyAdminClient_GetTunnelDestGroup() {
 
 	req := &iappb.GetTunnelDestGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#GetTunnelDestGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#GetTunnelDestGroupRequest.
 	}
 	resp, err := c.GetTunnelDestGroup(ctx, req)
 	if err != nil {
@@ -263,7 +263,7 @@ func ExampleIdentityAwareProxyAdminClient_DeleteTunnelDestGroup() {
 
 	req := &iappb.DeleteTunnelDestGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#DeleteTunnelDestGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#DeleteTunnelDestGroupRequest.
 	}
 	err = c.DeleteTunnelDestGroup(ctx, req)
 	if err != nil {
@@ -286,7 +286,7 @@ func ExampleIdentityAwareProxyAdminClient_UpdateTunnelDestGroup() {
 
 	req := &iappb.UpdateTunnelDestGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#UpdateTunnelDestGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#UpdateTunnelDestGroupRequest.
 	}
 	resp, err := c.UpdateTunnelDestGroup(ctx, req)
 	if err != nil {
diff --git a/iap/apiv1/identity_aware_proxyo_auth_client.go b/iap/apiv1/identity_aware_proxyo_auth_client.go
index 1684bc2a124..3d801f713ff 100644
--- a/iap/apiv1/identity_aware_proxyo_auth_client.go
+++ b/iap/apiv1/identity_aware_proxyo_auth_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	iappb "cloud.google.com/go/iap/apiv1/iappb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	iappb "google.golang.org/genproto/googleapis/cloud/iap/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/iap/apiv1/identity_aware_proxyo_auth_client_example_test.go b/iap/apiv1/identity_aware_proxyo_auth_client_example_test.go
index 43f6aad3a52..21130d4cd1d 100644
--- a/iap/apiv1/identity_aware_proxyo_auth_client_example_test.go
+++ b/iap/apiv1/identity_aware_proxyo_auth_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	iap "cloud.google.com/go/iap/apiv1"
+	iappb "cloud.google.com/go/iap/apiv1/iappb"
 	"google.golang.org/api/iterator"
-	iappb "google.golang.org/genproto/googleapis/cloud/iap/v1"
 )
 
 func ExampleNewIdentityAwareProxyOAuthClient() {
@@ -56,7 +56,7 @@ func ExampleIdentityAwareProxyOAuthClient_ListBrands() {
 
 	req := &iappb.ListBrandsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#ListBrandsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#ListBrandsRequest.
 	}
 	resp, err := c.ListBrands(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleIdentityAwareProxyOAuthClient_CreateBrand() {
 
 	req := &iappb.CreateBrandRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#CreateBrandRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#CreateBrandRequest.
 	}
 	resp, err := c.CreateBrand(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleIdentityAwareProxyOAuthClient_GetBrand() {
 
 	req := &iappb.GetBrandRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#GetBrandRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#GetBrandRequest.
 	}
 	resp, err := c.GetBrand(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleIdentityAwareProxyOAuthClient_CreateIdentityAwareProxyClient() {
 
 	req := &iappb.CreateIdentityAwareProxyClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#CreateIdentityAwareProxyClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#CreateIdentityAwareProxyClientRequest.
 	}
 	resp, err := c.CreateIdentityAwareProxyClient(ctx, req)
 	if err != nil {
@@ -156,7 +156,7 @@ func ExampleIdentityAwareProxyOAuthClient_ListIdentityAwareProxyClients() {
 
 	req := &iappb.ListIdentityAwareProxyClientsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#ListIdentityAwareProxyClientsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#ListIdentityAwareProxyClientsRequest.
 	}
 	it := c.ListIdentityAwareProxyClients(ctx, req)
 	for {
@@ -187,7 +187,7 @@ func ExampleIdentityAwareProxyOAuthClient_GetIdentityAwareProxyClient() {
 
 	req := &iappb.GetIdentityAwareProxyClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#GetIdentityAwareProxyClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#GetIdentityAwareProxyClientRequest.
 	}
 	resp, err := c.GetIdentityAwareProxyClient(ctx, req)
 	if err != nil {
@@ -212,7 +212,7 @@ func ExampleIdentityAwareProxyOAuthClient_ResetIdentityAwareProxyClientSecret()
 
 	req := &iappb.ResetIdentityAwareProxyClientSecretRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#ResetIdentityAwareProxyClientSecretRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#ResetIdentityAwareProxyClientSecretRequest.
 	}
 	resp, err := c.ResetIdentityAwareProxyClientSecret(ctx, req)
 	if err != nil {
@@ -237,7 +237,7 @@ func ExampleIdentityAwareProxyOAuthClient_DeleteIdentityAwareProxyClient() {
 
 	req := &iappb.DeleteIdentityAwareProxyClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iap/v1#DeleteIdentityAwareProxyClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iap/apiv1/iappb#DeleteIdentityAwareProxyClientRequest.
 	}
 	err = c.DeleteIdentityAwareProxyClient(ctx, req)
 	if err != nil {
diff --git a/iap/go.mod b/iap/go.mod
index ed736a213ad..b40ed34d3f1 100644
--- a/iap/go.mod
+++ b/iap/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/iap
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/iap/go.sum b/iap/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/iap/go.sum
+++ b/iap/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/ids/aliasshim/aliasshim.go b/ids/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/ids/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/ids/apiv1/doc.go b/ids/apiv1/doc.go
index facd0b84800..2ac365f1f48 100644
--- a/ids/apiv1/doc.go
+++ b/ids/apiv1/doc.go
@@ -61,7 +61,7 @@
 //
 //	req := &idspb.ListEndpointsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/ids/v1#ListEndpointsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/ids/apiv1/idspb#ListEndpointsRequest.
 //	}
 //	it := c.ListEndpoints(ctx, req)
 //	for {
diff --git a/ids/apiv1/ids_client.go b/ids/apiv1/ids_client.go
index 15be46afac4..8de3277d2b5 100644
--- a/ids/apiv1/ids_client.go
+++ b/ids/apiv1/ids_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	idspb "cloud.google.com/go/ids/apiv1/idspb"
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
 	gax "github.com/googleapis/gax-go/v2"
@@ -30,7 +31,6 @@ import (
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	idspb "google.golang.org/genproto/googleapis/cloud/ids/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/ids/apiv1/ids_client_example_test.go b/ids/apiv1/ids_client_example_test.go
index af0b4d30a58..7e4397a4972 100644
--- a/ids/apiv1/ids_client_example_test.go
+++ b/ids/apiv1/ids_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	ids "cloud.google.com/go/ids/apiv1"
+	idspb "cloud.google.com/go/ids/apiv1/idspb"
 	"google.golang.org/api/iterator"
-	idspb "google.golang.org/genproto/googleapis/cloud/ids/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListEndpoints() {
 
 	req := &idspb.ListEndpointsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/ids/v1#ListEndpointsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/ids/apiv1/idspb#ListEndpointsRequest.
 	}
 	it := c.ListEndpoints(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetEndpoint() {
 
 	req := &idspb.GetEndpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/ids/v1#GetEndpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/ids/apiv1/idspb#GetEndpointRequest.
 	}
 	resp, err := c.GetEndpoint(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_CreateEndpoint() {
 
 	req := &idspb.CreateEndpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/ids/v1#CreateEndpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/ids/apiv1/idspb#CreateEndpointRequest.
 	}
 	op, err := c.CreateEndpoint(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleClient_DeleteEndpoint() {
 
 	req := &idspb.DeleteEndpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/ids/v1#DeleteEndpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/ids/apiv1/idspb#DeleteEndpointRequest.
 	}
 	op, err := c.DeleteEndpoint(ctx, req)
 	if err != nil {
diff --git a/ids/apiv1/idspb/ids.pb.go b/ids/apiv1/idspb/ids.pb.go
index 3f68d59da4f..5bb7ac79e44 100644
--- a/ids/apiv1/idspb/ids.pb.go
+++ b/ids/apiv1/idspb/ids.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/ids/v1/ids.proto
 
 package idspb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -174,9 +174,9 @@ type Endpoint struct {
 	// Output only. The name of the endpoint.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The create time timestamp.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time timestamp.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The labels of the endpoint.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. The fully qualified URL of the network to which the IDS Endpoint is
@@ -235,14 +235,14 @@ func (x *Endpoint) GetName() string {
 	return ""
 }
 
-func (x *Endpoint) GetCreateTime() *timestamp.Timestamp {
+func (x *Endpoint) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Endpoint) GetUpdateTime() *timestamp.Timestamp {
+func (x *Endpoint) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -680,9 +680,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -730,14 +730,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_ids_v1_ids_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1011,7 +1011,7 @@ var file_google_cloud_ids_v1_ids_proto_goTypes = []interface{}{
 	(*DeleteEndpointRequest)(nil), // 7: google.cloud.ids.v1.DeleteEndpointRequest
 	(*OperationMetadata)(nil),     // 8: google.cloud.ids.v1.OperationMetadata
 	nil,                           // 9: google.cloud.ids.v1.Endpoint.LabelsEntry
-	(*timestamp.Timestamp)(nil),   // 10: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil), // 11: google.longrunning.Operation
 }
 var file_google_cloud_ids_v1_ids_proto_depIdxs = []int32{
diff --git a/ids/go.mod b/ids/go.mod
index a8106402a62..fdb71f42826 100644
--- a/ids/go.mod
+++ b/ids/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/ids
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/ids/go.sum b/ids/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/ids/go.sum
+++ b/ids/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/internal/.repo-metadata-full.json b/internal/.repo-metadata-full.json
index 39bc0be8c60..e08d0aa10f1 100644
--- a/internal/.repo-metadata-full.json
+++ b/internal/.repo-metadata-full.json
@@ -1048,7 +1048,7 @@
     "description": "Long Running Operations API",
     "language": "Go",
     "client_library_type": "generated",
-    "docs_url": "https://cloud.google.com/go/docs/reference/cloud.google.com/go/latest/longrunning/autogen",
+    "docs_url": "https://cloud.google.com/go/docs/reference/cloud.google.com/go/longrunning/latest/autogen",
     "release_level": "alpha",
     "library_type": "GAPIC_AUTO"
   },
diff --git a/internal/aliasfix/mappings.go b/internal/aliasfix/mappings.go
index f362e0ebaa1..14ac69fa9b1 100644
--- a/internal/aliasfix/mappings.go
+++ b/internal/aliasfix/mappings.go
@@ -48,19 +48,19 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/api/servicecontrol/v1": {
 		ImportPath: "cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/api/servicemanagement/v1": {
 		ImportPath: "cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/api/serviceusage/v1": {
 		ImportPath: "cloud.google.com/go/serviceusage/apiv1/serviceusagepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/appengine/v1": {
 		ImportPath: "cloud.google.com/go/appengine/apiv1/appenginepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/area120/tables/v1alpha1": {
 		ImportPath: "cloud.google.com/go/area120/tables/apiv1alpha1/tablespb",
@@ -68,7 +68,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/accessapproval/v1": {
 		ImportPath: "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/aiplatform/v1": {
 		ImportPath: "cloud.google.com/go/aiplatform/apiv1/aiplatformpb",
@@ -80,15 +80,15 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/apigateway/v1": {
 		ImportPath: "cloud.google.com/go/apigateway/apiv1/apigatewaypb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1": {
 		ImportPath: "cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/asset/v1": {
 		ImportPath: "cloud.google.com/go/asset/apiv1/assetpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/asset/v1p2beta1": {
 		ImportPath: "cloud.google.com/go/asset/apiv1p2beta1/assetpb",
@@ -100,7 +100,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1": {
 		ImportPath: "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1beta1": {
 		ImportPath: "cloud.google.com/go/assuredworkloads/apiv1beta1/assuredworkloadspb",
@@ -108,7 +108,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/automl/v1": {
 		ImportPath: "cloud.google.com/go/automl/apiv1/automlpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/automl/v1beta1": {
 		ImportPath: "cloud.google.com/go/automl/apiv1beta1/automlpb",
@@ -116,31 +116,31 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2": {
 		ImportPath: "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/batch/v1": {
 		ImportPath: "cloud.google.com/go/batch/apiv1/batchpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1": {
 		ImportPath: "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1": {
 		ImportPath: "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1": {
 		ImportPath: "cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1": {
 		ImportPath: "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1": {
 		ImportPath: "cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/bigquery/connection/v1": {
 		ImportPath: "cloud.google.com/go/bigquery/connection/apiv1/connectionpb",
@@ -188,7 +188,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/billing/budgets/v1": {
 		ImportPath: "cloud.google.com/go/billing/budgets/apiv1/budgetspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/billing/budgets/v1beta1": {
 		ImportPath: "cloud.google.com/go/billing/budgets/apiv1beta1/budgetspb",
@@ -196,11 +196,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/billing/v1": {
 		ImportPath: "cloud.google.com/go/billing/apiv1/billingpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1": {
 		ImportPath: "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1beta1": {
 		ImportPath: "cloud.google.com/go/binaryauthorization/apiv1beta1/binaryauthorizationpb",
@@ -208,15 +208,15 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/certificatemanager/v1": {
 		ImportPath: "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/channel/v1": {
 		ImportPath: "cloud.google.com/go/channel/apiv1/channelpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/clouddms/v1": {
 		ImportPath: "cloud.google.com/go/clouddms/apiv1/clouddmspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/compute/v1": {
 		ImportPath: "cloud.google.com/go/compute/apiv1/computepb",
@@ -224,11 +224,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1": {
 		ImportPath: "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/datacatalog/v1": {
 		ImportPath: "cloud.google.com/go/datacatalog/apiv1/datacatalogpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/datacatalog/v1beta1": {
 		ImportPath: "cloud.google.com/go/datacatalog/apiv1beta1/datacatalogpb",
@@ -240,7 +240,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/datafusion/v1": {
 		ImportPath: "cloud.google.com/go/datafusion/apiv1/datafusionpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/datalabeling/v1beta1": {
 		ImportPath: "cloud.google.com/go/datalabeling/apiv1beta1/datalabelingpb",
@@ -248,11 +248,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/dataplex/v1": {
 		ImportPath: "cloud.google.com/go/dataplex/apiv1/dataplexpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/dataproc/v1": {
 		ImportPath: "cloud.google.com/go/dataproc/apiv1/dataprocpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/dataqna/v1alpha": {
 		ImportPath: "cloud.google.com/go/dataqna/apiv1alpha/dataqnapb",
@@ -260,7 +260,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/datastream/v1": {
 		ImportPath: "cloud.google.com/go/datastream/apiv1/datastreampb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/datastream/v1alpha1": {
 		ImportPath: "cloud.google.com/go/datastream/apiv1alpha1/datastreampb",
@@ -268,11 +268,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/deploy/v1": {
 		ImportPath: "cloud.google.com/go/deploy/apiv1/deploypb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3": {
 		ImportPath: "cloud.google.com/go/dialogflow/cx/apiv3/cxpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3beta1": {
 		ImportPath: "cloud.google.com/go/dialogflow/cx/apiv3beta1/cxpb",
@@ -280,11 +280,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/dialogflow/v2": {
 		ImportPath: "cloud.google.com/go/dialogflow/apiv2/dialogflowpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/documentai/v1": {
 		ImportPath: "cloud.google.com/go/documentai/apiv1/documentaipb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/documentai/v1beta3": {
 		ImportPath: "cloud.google.com/go/documentai/apiv1beta3/documentaipb",
@@ -296,27 +296,27 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1": {
 		ImportPath: "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1": {
 		ImportPath: "cloud.google.com/go/eventarc/publishing/apiv1/publishingpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/eventarc/v1": {
 		ImportPath: "cloud.google.com/go/eventarc/apiv1/eventarcpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/filestore/v1": {
 		ImportPath: "cloud.google.com/go/filestore/apiv1/filestorepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/functions/v1": {
 		ImportPath: "cloud.google.com/go/functions/apiv1/functionspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/functions/v2": {
 		ImportPath: "cloud.google.com/go/functions/apiv2/functionspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/functions/v2beta": {
 		ImportPath: "cloud.google.com/go/functions/apiv2beta/functionspb",
@@ -324,7 +324,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/gaming/v1": {
 		ImportPath: "cloud.google.com/go/gaming/apiv1/gamingpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/gaming/v1beta": {
 		ImportPath: "cloud.google.com/go/gaming/apiv1beta/gamingpb",
@@ -332,7 +332,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/gkebackup/v1": {
 		ImportPath: "cloud.google.com/go/gkebackup/apiv1/gkebackuppb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/gkeconnect/gateway/v1beta1": {
 		ImportPath: "cloud.google.com/go/gkeconnect/gateway/apiv1beta1/gatewaypb",
@@ -344,31 +344,31 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1": {
 		ImportPath: "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/gsuiteaddons/v1": {
 		ImportPath: "cloud.google.com/go/gsuiteaddons/apiv1/gsuiteaddonspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/iap/v1": {
 		ImportPath: "cloud.google.com/go/iap/apiv1/iappb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/ids/v1": {
 		ImportPath: "cloud.google.com/go/ids/apiv1/idspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/iot/v1": {
 		ImportPath: "cloud.google.com/go/iot/apiv1/iotpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/kms/v1": {
 		ImportPath: "cloud.google.com/go/kms/apiv1/kmspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/language/v1": {
 		ImportPath: "cloud.google.com/go/language/apiv1/languagepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/language/v1beta2": {
 		ImportPath: "cloud.google.com/go/language/apiv1beta2/languagepb",
@@ -380,7 +380,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/managedidentities/v1": {
 		ImportPath: "cloud.google.com/go/managedidentities/apiv1/managedidentitiespb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/mediatranslation/v1beta1": {
 		ImportPath: "cloud.google.com/go/mediatranslation/apiv1beta1/mediatranslationpb",
@@ -388,7 +388,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/memcache/v1": {
 		ImportPath: "cloud.google.com/go/memcache/apiv1/memcachepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/memcache/v1beta2": {
 		ImportPath: "cloud.google.com/go/memcache/apiv1beta2/memcachepb",
@@ -396,7 +396,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/metastore/v1": {
 		ImportPath: "cloud.google.com/go/metastore/apiv1/metastorepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/metastore/v1alpha": {
 		ImportPath: "cloud.google.com/go/metastore/apiv1alpha/metastorepb",
@@ -408,7 +408,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1": {
 		ImportPath: "cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1alpha1": {
 		ImportPath: "cloud.google.com/go/networkconnectivity/apiv1alpha1/networkconnectivitypb",
@@ -416,7 +416,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/networkmanagement/v1": {
 		ImportPath: "cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/networksecurity/v1beta1": {
 		ImportPath: "cloud.google.com/go/networksecurity/apiv1beta1/networksecuritypb",
@@ -424,7 +424,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/notebooks/v1": {
 		ImportPath: "cloud.google.com/go/notebooks/apiv1/notebookspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/notebooks/v1beta1": {
 		ImportPath: "cloud.google.com/go/notebooks/apiv1beta1/notebookspb",
@@ -432,19 +432,19 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/optimization/v1": {
 		ImportPath: "cloud.google.com/go/optimization/apiv1/optimizationpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1": {
 		ImportPath: "cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/orgpolicy/v2": {
 		ImportPath: "cloud.google.com/go/orgpolicy/apiv2/orgpolicypb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1": {
 		ImportPath: "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1beta": {
 		ImportPath: "cloud.google.com/go/osconfig/agentendpoint/apiv1beta/agentendpointpb",
@@ -452,7 +452,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/osconfig/v1": {
 		ImportPath: "cloud.google.com/go/osconfig/apiv1/osconfigpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/osconfig/v1alpha": {
 		ImportPath: "cloud.google.com/go/osconfig/apiv1alpha/osconfigpb",
@@ -464,7 +464,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/oslogin/v1": {
 		ImportPath: "cloud.google.com/go/oslogin/apiv1/osloginpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/oslogin/v1beta": {
 		ImportPath: "cloud.google.com/go/oslogin/apiv1beta/osloginpb",
@@ -476,7 +476,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/policytroubleshooter/v1": {
 		ImportPath: "cloud.google.com/go/policytroubleshooter/apiv1/policytroubleshooterpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/privatecatalog/v1beta1": {
 		ImportPath: "cloud.google.com/go/privatecatalog/apiv1beta1/privatecatalogpb",
@@ -488,7 +488,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1": {
 		ImportPath: "cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1beta1": {
 		ImportPath: "cloud.google.com/go/recaptchaenterprise/v2/apiv1beta1/recaptchaenterprisepb",
@@ -500,7 +500,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/recommender/v1": {
 		ImportPath: "cloud.google.com/go/recommender/apiv1/recommenderpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/recommender/v1beta1": {
 		ImportPath: "cloud.google.com/go/recommender/apiv1beta1/recommenderpb",
@@ -508,7 +508,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/redis/v1": {
 		ImportPath: "cloud.google.com/go/redis/apiv1/redispb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/redis/v1beta1": {
 		ImportPath: "cloud.google.com/go/redis/apiv1beta1/redispb",
@@ -516,19 +516,19 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/resourcemanager/v2": {
 		ImportPath: "cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/resourcemanager/v3": {
 		ImportPath: "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/resourcesettings/v1": {
 		ImportPath: "cloud.google.com/go/resourcesettings/apiv1/resourcesettingspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/retail/v2": {
 		ImportPath: "cloud.google.com/go/retail/apiv2/retailpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/retail/v2alpha": {
 		ImportPath: "cloud.google.com/go/retail/apiv2alpha/retailpb",
@@ -540,11 +540,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/run/v2": {
 		ImportPath: "cloud.google.com/go/run/apiv2/runpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/scheduler/v1": {
 		ImportPath: "cloud.google.com/go/scheduler/apiv1/schedulerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/scheduler/v1beta1": {
 		ImportPath: "cloud.google.com/go/scheduler/apiv1beta1/schedulerpb",
@@ -552,11 +552,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/secretmanager/v1": {
 		ImportPath: "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/security/privateca/v1": {
 		ImportPath: "cloud.google.com/go/security/privateca/apiv1/privatecapb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/security/privateca/v1beta1": {
 		ImportPath: "cloud.google.com/go/security/privateca/apiv1beta1/privatecapb",
@@ -568,7 +568,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/securitycenter/v1": {
 		ImportPath: "cloud.google.com/go/securitycenter/apiv1/securitycenterpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/securitycenter/v1beta1": {
 		ImportPath: "cloud.google.com/go/securitycenter/apiv1beta1/securitycenterpb",
@@ -580,7 +580,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/servicedirectory/v1": {
 		ImportPath: "cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/servicedirectory/v1beta1": {
 		ImportPath: "cloud.google.com/go/servicedirectory/apiv1beta1/servicedirectorypb",
@@ -588,11 +588,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/shell/v1": {
 		ImportPath: "cloud.google.com/go/shell/apiv1/shellpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/speech/v1": {
 		ImportPath: "cloud.google.com/go/speech/apiv1/speechpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/speech/v1p1beta1": {
 		ImportPath: "cloud.google.com/go/speech/apiv1p1beta1/speechpb",
@@ -600,7 +600,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/talent/v4": {
 		ImportPath: "cloud.google.com/go/talent/apiv4/talentpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/talent/v4beta1": {
 		ImportPath: "cloud.google.com/go/talent/apiv4beta1/talentpb",
@@ -608,7 +608,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/tasks/v2": {
 		ImportPath: "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/tasks/v2beta2": {
 		ImportPath: "cloud.google.com/go/cloudtasks/apiv2beta2/cloudtaskspb",
@@ -620,31 +620,31 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/texttospeech/v1": {
 		ImportPath: "cloud.google.com/go/texttospeech/apiv1/texttospeechpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/tpu/v1": {
 		ImportPath: "cloud.google.com/go/tpu/apiv1/tpupb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/translate/v3": {
 		ImportPath: "cloud.google.com/go/translate/apiv3/translatepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/video/livestream/v1": {
 		ImportPath: "cloud.google.com/go/video/livestream/apiv1/livestreampb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/video/stitcher/v1": {
 		ImportPath: "cloud.google.com/go/video/stitcher/apiv1/stitcherpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/video/transcoder/v1": {
 		ImportPath: "cloud.google.com/go/video/transcoder/apiv1/transcoderpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/videointelligence/v1": {
 		ImportPath: "cloud.google.com/go/videointelligence/apiv1/videointelligencepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/videointelligence/v1beta2": {
 		ImportPath: "cloud.google.com/go/videointelligence/apiv1beta2/videointelligencepb",
@@ -656,7 +656,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/vision/v1": {
 		ImportPath: "cloud.google.com/go/vision/v2/apiv1/visionpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1": {
 		ImportPath: "cloud.google.com/go/vision/v2/apiv1p1beta1/visionpb",
@@ -664,15 +664,15 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/vmmigration/v1": {
 		ImportPath: "cloud.google.com/go/vmmigration/apiv1/vmmigrationpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/vpcaccess/v1": {
 		ImportPath: "cloud.google.com/go/vpcaccess/apiv1/vpcaccesspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/webrisk/v1": {
 		ImportPath: "cloud.google.com/go/webrisk/apiv1/webriskpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/webrisk/v1beta1": {
 		ImportPath: "cloud.google.com/go/webrisk/apiv1beta1/webriskpb",
@@ -680,11 +680,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1": {
 		ImportPath: "cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/workflows/executions/v1": {
 		ImportPath: "cloud.google.com/go/workflows/executions/apiv1/executionspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/workflows/executions/v1beta": {
 		ImportPath: "cloud.google.com/go/workflows/executions/apiv1beta/executionspb",
@@ -692,7 +692,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/cloud/workflows/v1": {
 		ImportPath: "cloud.google.com/go/workflows/apiv1/workflowspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/workflows/v1beta": {
 		ImportPath: "cloud.google.com/go/workflows/apiv1beta/workflowspb",
@@ -700,7 +700,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/container/v1": {
 		ImportPath: "cloud.google.com/go/container/apiv1/containerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/dataflow/v1beta3": {
 		ImportPath: "cloud.google.com/go/dataflow/apiv1beta3/dataflowpb",
@@ -712,7 +712,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/devtools/artifactregistry/v1": {
 		ImportPath: "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/devtools/artifactregistry/v1beta2": {
 		ImportPath: "cloud.google.com/go/artifactregistry/apiv1beta2/artifactregistrypb",
@@ -720,11 +720,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/devtools/cloudbuild/v1": {
 		ImportPath: "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/devtools/clouddebugger/v2": {
 		ImportPath: "cloud.google.com/go/debugger/apiv2/debuggerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/devtools/clouderrorreporting/v1beta1": {
 		ImportPath: "cloud.google.com/go/errorreporting/apiv1beta1/errorreportingpb",
@@ -732,11 +732,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/devtools/cloudtrace/v1": {
 		ImportPath: "cloud.google.com/go/trace/apiv1/tracepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/devtools/cloudtrace/v2": {
 		ImportPath: "cloud.google.com/go/trace/apiv2/tracepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/devtools/containeranalysis/v1beta1": {
 		ImportPath: "cloud.google.com/go/containeranalysis/apiv1beta1/containeranalysispb",
@@ -756,11 +756,11 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/iam/credentials/v1": {
 		ImportPath: "cloud.google.com/go/iam/credentials/apiv1/credentialspb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1": {
 		ImportPath: "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/logging/v2": {
 		ImportPath: "cloud.google.com/go/logging/apiv2/loggingpb",
@@ -768,23 +768,23 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/longrunning": {
 		ImportPath: "cloud.google.com/go/longrunning/autogen/longrunningpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/monitoring/dashboard/v1": {
 		ImportPath: "cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/monitoring/metricsscope/v1": {
 		ImportPath: "cloud.google.com/go/monitoring/metricsscope/apiv1/metricsscopepb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/monitoring/v3": {
 		ImportPath: "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/privacy/dlp/v2": {
 		ImportPath: "cloud.google.com/go/dlp/apiv2/dlppb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/pubsub/v1": {
 		ImportPath: "cloud.google.com/go/pubsub/apiv1/pubsubpb",
@@ -808,7 +808,7 @@ var GenprotoPkgMigration map[string]Pkg = map[string]Pkg{
 	},
 	"google.golang.org/genproto/googleapis/storagetransfer/v1": {
 		ImportPath: "cloud.google.com/go/storagetransfer/apiv1/storagetransferpb",
-		Status:     StatusInProgress,
+		Status:     StatusMigrated,
 	},
 	"google.golang.org/genproto/googleapis/cloud/security/publicca/v1beta1": {
 		ImportPath: "cloud.google.com/go/security/publicca/apiv1beta1/publiccapb",
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/ApproveApprovalRequest/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/ApproveApprovalRequest/main.go
index edc258b0f23..b01f8299210 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/ApproveApprovalRequest/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/ApproveApprovalRequest/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accessapprovalpb.ApproveApprovalRequestMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#ApproveApprovalRequestMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#ApproveApprovalRequestMessage.
 	}
 	resp, err := c.ApproveApprovalRequest(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/DeleteAccessApprovalSettings/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/DeleteAccessApprovalSettings/main.go
index c09cb8f86e0..6a0868a00f4 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/DeleteAccessApprovalSettings/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/DeleteAccessApprovalSettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accessapprovalpb.DeleteAccessApprovalSettingsMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#DeleteAccessApprovalSettingsMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#DeleteAccessApprovalSettingsMessage.
 	}
 	err = c.DeleteAccessApprovalSettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/DismissApprovalRequest/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/DismissApprovalRequest/main.go
index cf5847742dc..f86d61a0021 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/DismissApprovalRequest/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/DismissApprovalRequest/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accessapprovalpb.DismissApprovalRequestMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#DismissApprovalRequestMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#DismissApprovalRequestMessage.
 	}
 	resp, err := c.DismissApprovalRequest(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/GetAccessApprovalServiceAccount/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/GetAccessApprovalServiceAccount/main.go
index edb067b5309..b910915a30b 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/GetAccessApprovalServiceAccount/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/GetAccessApprovalServiceAccount/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accessapprovalpb.GetAccessApprovalServiceAccountMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#GetAccessApprovalServiceAccountMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#GetAccessApprovalServiceAccountMessage.
 	}
 	resp, err := c.GetAccessApprovalServiceAccount(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/GetAccessApprovalSettings/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/GetAccessApprovalSettings/main.go
index 1dc17ad4ad8..ad303eba6de 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/GetAccessApprovalSettings/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/GetAccessApprovalSettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accessapprovalpb.GetAccessApprovalSettingsMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#GetAccessApprovalSettingsMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#GetAccessApprovalSettingsMessage.
 	}
 	resp, err := c.GetAccessApprovalSettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/GetApprovalRequest/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/GetApprovalRequest/main.go
index ea268364f1d..b33a6d7cd37 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/GetApprovalRequest/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/GetApprovalRequest/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accessapprovalpb.GetApprovalRequestMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#GetApprovalRequestMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#GetApprovalRequestMessage.
 	}
 	resp, err := c.GetApprovalRequest(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/InvalidateApprovalRequest/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/InvalidateApprovalRequest/main.go
index 57673a2a638..e997153738c 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/InvalidateApprovalRequest/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/InvalidateApprovalRequest/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accessapprovalpb.InvalidateApprovalRequestMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#InvalidateApprovalRequestMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#InvalidateApprovalRequestMessage.
 	}
 	resp, err := c.InvalidateApprovalRequest(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/ListApprovalRequests/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/ListApprovalRequests/main.go
index 7f50da26826..abe91ba3da4 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/ListApprovalRequests/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/ListApprovalRequests/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 	"google.golang.org/api/iterator"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &accessapprovalpb.ListApprovalRequestsMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#ListApprovalRequestsMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#ListApprovalRequestsMessage.
 	}
 	it := c.ListApprovalRequests(ctx, req)
 	for {
diff --git a/internal/generated/snippets/accessapproval/apiv1/Client/UpdateAccessApprovalSettings/main.go b/internal/generated/snippets/accessapproval/apiv1/Client/UpdateAccessApprovalSettings/main.go
index 42b928a615e..cb2c7e59b00 100644
--- a/internal/generated/snippets/accessapproval/apiv1/Client/UpdateAccessApprovalSettings/main.go
+++ b/internal/generated/snippets/accessapproval/apiv1/Client/UpdateAccessApprovalSettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accessapproval "cloud.google.com/go/accessapproval/apiv1"
-
-	accessapprovalpb "google.golang.org/genproto/googleapis/cloud/accessapproval/v1"
+	accessapprovalpb "cloud.google.com/go/accessapproval/apiv1/accessapprovalpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accessapprovalpb.UpdateAccessApprovalSettingsMessage{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/accessapproval/v1#UpdateAccessApprovalSettingsMessage.
+		// See https://pkg.go.dev/cloud.google.com/go/accessapproval/apiv1/accessapprovalpb#UpdateAccessApprovalSettingsMessage.
 	}
 	resp, err := c.UpdateAccessApprovalSettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accessapproval/apiv1/snippet_metadata.google.cloud.accessapproval.v1.json b/internal/generated/snippets/accessapproval/apiv1/snippet_metadata.google.cloud.accessapproval.v1.json
index 833d67cc3ec..d595725c973 100644
--- a/internal/generated/snippets/accessapproval/apiv1/snippet_metadata.google.cloud.accessapproval.v1.json
+++ b/internal/generated/snippets/accessapproval/apiv1/snippet_metadata.google.cloud.accessapproval.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/accessapproval/apiv1",
-    "version": "1.3.1",
+    "version": "1.4.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -419,7 +419,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CommitServicePerimeters/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CommitServicePerimeters/main.go
index 85f977d1602..2ea4080d44e 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CommitServicePerimeters/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CommitServicePerimeters/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.CommitServicePerimetersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#CommitServicePerimetersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#CommitServicePerimetersRequest.
 	}
 	op, err := c.CommitServicePerimeters(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateAccessLevel/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateAccessLevel/main.go
index e443dc3182e..8b8176a9d70 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateAccessLevel/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateAccessLevel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.CreateAccessLevelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#CreateAccessLevelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#CreateAccessLevelRequest.
 	}
 	op, err := c.CreateAccessLevel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateAccessPolicy/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateAccessPolicy/main.go
index 8e177d46528..9339d33e19b 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateAccessPolicy/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateAccessPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.AccessPolicy{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#AccessPolicy.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#AccessPolicy.
 	}
 	op, err := c.CreateAccessPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateGcpUserAccessBinding/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateGcpUserAccessBinding/main.go
index d2e8b17c93c..6a9513c2306 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateGcpUserAccessBinding/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateGcpUserAccessBinding/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.CreateGcpUserAccessBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#CreateGcpUserAccessBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#CreateGcpUserAccessBindingRequest.
 	}
 	op, err := c.CreateGcpUserAccessBinding(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateServicePerimeter/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateServicePerimeter/main.go
index 4e46fb5c4bb..e444f387059 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateServicePerimeter/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/CreateServicePerimeter/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.CreateServicePerimeterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#CreateServicePerimeterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#CreateServicePerimeterRequest.
 	}
 	op, err := c.CreateServicePerimeter(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteAccessLevel/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteAccessLevel/main.go
index 4ca7342225c..d5f79018909 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteAccessLevel/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteAccessLevel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.DeleteAccessLevelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#DeleteAccessLevelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#DeleteAccessLevelRequest.
 	}
 	op, err := c.DeleteAccessLevel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteAccessPolicy/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteAccessPolicy/main.go
index aa7cf64ca0b..c58ecbda9af 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteAccessPolicy/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteAccessPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.DeleteAccessPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#DeleteAccessPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#DeleteAccessPolicyRequest.
 	}
 	op, err := c.DeleteAccessPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteGcpUserAccessBinding/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteGcpUserAccessBinding/main.go
index 6251abac675..8a8ef8650bb 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteGcpUserAccessBinding/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteGcpUserAccessBinding/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.DeleteGcpUserAccessBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#DeleteGcpUserAccessBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#DeleteGcpUserAccessBindingRequest.
 	}
 	op, err := c.DeleteGcpUserAccessBinding(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteServicePerimeter/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteServicePerimeter/main.go
index d1471d79bdb..d584c8ece05 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteServicePerimeter/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/DeleteServicePerimeter/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.DeleteServicePerimeterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#DeleteServicePerimeterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#DeleteServicePerimeterRequest.
 	}
 	op, err := c.DeleteServicePerimeter(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetAccessLevel/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetAccessLevel/main.go
index f3c979e9b4d..2e4093485a4 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetAccessLevel/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetAccessLevel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.GetAccessLevelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#GetAccessLevelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#GetAccessLevelRequest.
 	}
 	resp, err := c.GetAccessLevel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetAccessPolicy/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetAccessPolicy/main.go
index 6add2e90fbb..3394a54377e 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetAccessPolicy/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetAccessPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.GetAccessPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#GetAccessPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#GetAccessPolicyRequest.
 	}
 	resp, err := c.GetAccessPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetGcpUserAccessBinding/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetGcpUserAccessBinding/main.go
index e277feb9124..e9b37452dec 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetGcpUserAccessBinding/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetGcpUserAccessBinding/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.GetGcpUserAccessBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#GetGcpUserAccessBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#GetGcpUserAccessBindingRequest.
 	}
 	resp, err := c.GetGcpUserAccessBinding(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetServicePerimeter/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetServicePerimeter/main.go
index 065574e1b16..7f839f44cdb 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetServicePerimeter/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/GetServicePerimeter/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.GetServicePerimeterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#GetServicePerimeterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#GetServicePerimeterRequest.
 	}
 	resp, err := c.GetServicePerimeter(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListAccessLevels/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListAccessLevels/main.go
index 87b28c6800b..07524aa943b 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListAccessLevels/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListAccessLevels/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 	"google.golang.org/api/iterator"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.ListAccessLevelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListAccessLevelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListAccessLevelsRequest.
 	}
 	it := c.ListAccessLevels(ctx, req)
 	for {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListAccessPolicies/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListAccessPolicies/main.go
index 6f492a87988..97d7583051b 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListAccessPolicies/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListAccessPolicies/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 	"google.golang.org/api/iterator"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.ListAccessPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListAccessPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListAccessPoliciesRequest.
 	}
 	it := c.ListAccessPolicies(ctx, req)
 	for {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListGcpUserAccessBindings/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListGcpUserAccessBindings/main.go
index 7fc6f774fb4..999006229b8 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListGcpUserAccessBindings/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListGcpUserAccessBindings/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 	"google.golang.org/api/iterator"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.ListGcpUserAccessBindingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListGcpUserAccessBindingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListGcpUserAccessBindingsRequest.
 	}
 	it := c.ListGcpUserAccessBindings(ctx, req)
 	for {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListServicePerimeters/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListServicePerimeters/main.go
index 14e4297a36b..0f3a65d67d2 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListServicePerimeters/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ListServicePerimeters/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 	"google.golang.org/api/iterator"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.ListServicePerimetersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ListServicePerimetersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ListServicePerimetersRequest.
 	}
 	it := c.ListServicePerimeters(ctx, req)
 	for {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ReplaceAccessLevels/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ReplaceAccessLevels/main.go
index b8e2f644396..b94bef410b9 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ReplaceAccessLevels/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ReplaceAccessLevels/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.ReplaceAccessLevelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ReplaceAccessLevelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ReplaceAccessLevelsRequest.
 	}
 	op, err := c.ReplaceAccessLevels(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ReplaceServicePerimeters/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ReplaceServicePerimeters/main.go
index 57c9f4fe65d..eaa2132b301 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/ReplaceServicePerimeters/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/ReplaceServicePerimeters/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.ReplaceServicePerimetersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#ReplaceServicePerimetersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#ReplaceServicePerimetersRequest.
 	}
 	op, err := c.ReplaceServicePerimeters(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateAccessLevel/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateAccessLevel/main.go
index c7e78ad58b2..7a3ee0fb6f8 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateAccessLevel/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateAccessLevel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.UpdateAccessLevelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#UpdateAccessLevelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#UpdateAccessLevelRequest.
 	}
 	op, err := c.UpdateAccessLevel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateAccessPolicy/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateAccessPolicy/main.go
index be2539e696a..cf308dc323d 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateAccessPolicy/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateAccessPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.UpdateAccessPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#UpdateAccessPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#UpdateAccessPolicyRequest.
 	}
 	op, err := c.UpdateAccessPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateGcpUserAccessBinding/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateGcpUserAccessBinding/main.go
index 31f7a1c3a1a..5dd1bee4ed6 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateGcpUserAccessBinding/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateGcpUserAccessBinding/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.UpdateGcpUserAccessBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#UpdateGcpUserAccessBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#UpdateGcpUserAccessBindingRequest.
 	}
 	op, err := c.UpdateGcpUserAccessBinding(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateServicePerimeter/main.go b/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateServicePerimeter/main.go
index cddeb001d70..62aeae37c1b 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateServicePerimeter/main.go
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/Client/UpdateServicePerimeter/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	accesscontextmanager "cloud.google.com/go/accesscontextmanager/apiv1"
-
-	accesscontextmanagerpb "google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1"
+	accesscontextmanagerpb "cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &accesscontextmanagerpb.UpdateServicePerimeterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/identity/accesscontextmanager/v1#UpdateServicePerimeterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/accesscontextmanager/apiv1/accesscontextmanagerpb#UpdateServicePerimeterRequest.
 	}
 	op, err := c.UpdateServicePerimeter(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/accesscontextmanager/apiv1/snippet_metadata.google.identity.accesscontextmanager.v1.json b/internal/generated/snippets/accesscontextmanager/apiv1/snippet_metadata.google.identity.accesscontextmanager.v1.json
index 05ac7c1a27b..5be13d543b3 100644
--- a/internal/generated/snippets/accesscontextmanager/apiv1/snippet_metadata.google.identity.accesscontextmanager.v1.json
+++ b/internal/generated/snippets/accesscontextmanager/apiv1/snippet_metadata.google.identity.accesscontextmanager.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/accesscontextmanager/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -742,7 +742,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -788,7 +788,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -834,7 +834,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -880,7 +880,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -926,7 +926,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -972,7 +972,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1018,7 +1018,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1064,7 +1064,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/CreateApi/main.go b/internal/generated/snippets/apigateway/apiv1/Client/CreateApi/main.go
index a8195c7a4fe..81e297328ae 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/CreateApi/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/CreateApi/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.CreateApiRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#CreateApiRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#CreateApiRequest.
 	}
 	op, err := c.CreateApi(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/CreateApiConfig/main.go b/internal/generated/snippets/apigateway/apiv1/Client/CreateApiConfig/main.go
index 3f109b87789..376ad929289 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/CreateApiConfig/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/CreateApiConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.CreateApiConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#CreateApiConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#CreateApiConfigRequest.
 	}
 	op, err := c.CreateApiConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/CreateGateway/main.go b/internal/generated/snippets/apigateway/apiv1/Client/CreateGateway/main.go
index 2ec7209adc5..1cd7960f78c 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/CreateGateway/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/CreateGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.CreateGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#CreateGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#CreateGatewayRequest.
 	}
 	op, err := c.CreateGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/DeleteApi/main.go b/internal/generated/snippets/apigateway/apiv1/Client/DeleteApi/main.go
index 5f3ed3a163f..dfb069720ae 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/DeleteApi/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/DeleteApi/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.DeleteApiRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#DeleteApiRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#DeleteApiRequest.
 	}
 	op, err := c.DeleteApi(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/DeleteApiConfig/main.go b/internal/generated/snippets/apigateway/apiv1/Client/DeleteApiConfig/main.go
index 72cf2147758..9bb017e29f2 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/DeleteApiConfig/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/DeleteApiConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.DeleteApiConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#DeleteApiConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#DeleteApiConfigRequest.
 	}
 	op, err := c.DeleteApiConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/DeleteGateway/main.go b/internal/generated/snippets/apigateway/apiv1/Client/DeleteGateway/main.go
index 789e98cfe03..8d132e9abd8 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/DeleteGateway/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/DeleteGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.DeleteGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#DeleteGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#DeleteGatewayRequest.
 	}
 	op, err := c.DeleteGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/GetApi/main.go b/internal/generated/snippets/apigateway/apiv1/Client/GetApi/main.go
index 2558297d28d..6eaece0a612 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/GetApi/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/GetApi/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.GetApiRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#GetApiRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#GetApiRequest.
 	}
 	resp, err := c.GetApi(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/GetApiConfig/main.go b/internal/generated/snippets/apigateway/apiv1/Client/GetApiConfig/main.go
index d5572dd87c9..ef5a1eeb45c 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/GetApiConfig/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/GetApiConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.GetApiConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#GetApiConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#GetApiConfigRequest.
 	}
 	resp, err := c.GetApiConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/GetGateway/main.go b/internal/generated/snippets/apigateway/apiv1/Client/GetGateway/main.go
index 4c6572f4bc4..d84f276b311 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/GetGateway/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/GetGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.GetGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#GetGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#GetGatewayRequest.
 	}
 	resp, err := c.GetGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/ListApiConfigs/main.go b/internal/generated/snippets/apigateway/apiv1/Client/ListApiConfigs/main.go
index 9f2c72b2605..69e3ad53014 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/ListApiConfigs/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/ListApiConfigs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 	"google.golang.org/api/iterator"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &apigatewaypb.ListApiConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#ListApiConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#ListApiConfigsRequest.
 	}
 	it := c.ListApiConfigs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/ListApis/main.go b/internal/generated/snippets/apigateway/apiv1/Client/ListApis/main.go
index 6f30e6ad7af..d8700d5a4b7 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/ListApis/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/ListApis/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 	"google.golang.org/api/iterator"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &apigatewaypb.ListApisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#ListApisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#ListApisRequest.
 	}
 	it := c.ListApis(ctx, req)
 	for {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/ListGateways/main.go b/internal/generated/snippets/apigateway/apiv1/Client/ListGateways/main.go
index 5fe900ae42a..27d666d79e3 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/ListGateways/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/ListGateways/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 	"google.golang.org/api/iterator"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &apigatewaypb.ListGatewaysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#ListGatewaysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#ListGatewaysRequest.
 	}
 	it := c.ListGateways(ctx, req)
 	for {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/UpdateApi/main.go b/internal/generated/snippets/apigateway/apiv1/Client/UpdateApi/main.go
index 2a7a94114f2..8e726a3fe4a 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/UpdateApi/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/UpdateApi/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.UpdateApiRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#UpdateApiRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#UpdateApiRequest.
 	}
 	op, err := c.UpdateApi(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/UpdateApiConfig/main.go b/internal/generated/snippets/apigateway/apiv1/Client/UpdateApiConfig/main.go
index 9652df615ba..69685efba96 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/UpdateApiConfig/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/UpdateApiConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.UpdateApiConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#UpdateApiConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#UpdateApiConfigRequest.
 	}
 	op, err := c.UpdateApiConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/Client/UpdateGateway/main.go b/internal/generated/snippets/apigateway/apiv1/Client/UpdateGateway/main.go
index f5b972694c0..5128b0ffef4 100644
--- a/internal/generated/snippets/apigateway/apiv1/Client/UpdateGateway/main.go
+++ b/internal/generated/snippets/apigateway/apiv1/Client/UpdateGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	apigateway "cloud.google.com/go/apigateway/apiv1"
-
-	apigatewaypb "google.golang.org/genproto/googleapis/cloud/apigateway/v1"
+	apigatewaypb "cloud.google.com/go/apigateway/apiv1/apigatewaypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &apigatewaypb.UpdateGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigateway/v1#UpdateGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigateway/apiv1/apigatewaypb#UpdateGatewayRequest.
 	}
 	op, err := c.UpdateGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/apigateway/apiv1/snippet_metadata.google.cloud.apigateway.v1.json b/internal/generated/snippets/apigateway/apiv1/snippet_metadata.google.cloud.apigateway.v1.json
index cec58d6f31d..4d78bea6671 100644
--- a/internal/generated/snippets/apigateway/apiv1/snippet_metadata.google.cloud.apigateway.v1.json
+++ b/internal/generated/snippets/apigateway/apiv1/snippet_metadata.google.cloud.apigateway.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/apigateway/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/apigeeconnect/apiv1/ConnectionClient/ListConnections/main.go b/internal/generated/snippets/apigeeconnect/apiv1/ConnectionClient/ListConnections/main.go
index aa4475c73a6..7fa1366afac 100644
--- a/internal/generated/snippets/apigeeconnect/apiv1/ConnectionClient/ListConnections/main.go
+++ b/internal/generated/snippets/apigeeconnect/apiv1/ConnectionClient/ListConnections/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	apigeeconnect "cloud.google.com/go/apigeeconnect/apiv1"
+	apigeeconnectpb "cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb"
 	"google.golang.org/api/iterator"
-
-	apigeeconnectpb "google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &apigeeconnectpb.ListConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1#ListConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb#ListConnectionsRequest.
 	}
 	it := c.ListConnections(ctx, req)
 	for {
diff --git a/internal/generated/snippets/apigeeconnect/apiv1/TetherClient/Egress/main.go b/internal/generated/snippets/apigeeconnect/apiv1/TetherClient/Egress/main.go
index 70fa350212b..dc57291317f 100644
--- a/internal/generated/snippets/apigeeconnect/apiv1/TetherClient/Egress/main.go
+++ b/internal/generated/snippets/apigeeconnect/apiv1/TetherClient/Egress/main.go
@@ -23,7 +23,7 @@ import (
 	"io"
 
 	apigeeconnect "cloud.google.com/go/apigeeconnect/apiv1"
-	apigeeconnectpb "google.golang.org/genproto/googleapis/cloud/apigeeconnect/v1"
+	apigeeconnectpb "cloud.google.com/go/apigeeconnect/apiv1/apigeeconnectpb"
 )
 
 func main() {
diff --git a/internal/generated/snippets/apigeeconnect/apiv1/snippet_metadata.google.cloud.apigeeconnect.v1.json b/internal/generated/snippets/apigeeconnect/apiv1/snippet_metadata.google.cloud.apigeeconnect.v1.json
index b1d873d3489..847951342b3 100644
--- a/internal/generated/snippets/apigeeconnect/apiv1/snippet_metadata.google.cloud.apigeeconnect.v1.json
+++ b/internal/generated/snippets/apigeeconnect/apiv1/snippet_metadata.google.cloud.apigeeconnect.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/apigeeconnect/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/appengine/apiv1/ApplicationsClient/CreateApplication/main.go b/internal/generated/snippets/appengine/apiv1/ApplicationsClient/CreateApplication/main.go
index 9d0857dbf0d..c986987cfd5 100644
--- a/internal/generated/snippets/appengine/apiv1/ApplicationsClient/CreateApplication/main.go
+++ b/internal/generated/snippets/appengine/apiv1/ApplicationsClient/CreateApplication/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &appenginepb.CreateApplicationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateApplicationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateApplicationRequest.
 	}
 	op, err := c.CreateApplication(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/ApplicationsClient/GetApplication/main.go b/internal/generated/snippets/appengine/apiv1/ApplicationsClient/GetApplication/main.go
index 9532f658e01..0dabfed6658 100644
--- a/internal/generated/snippets/appengine/apiv1/ApplicationsClient/GetApplication/main.go
+++ b/internal/generated/snippets/appengine/apiv1/ApplicationsClient/GetApplication/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &appenginepb.GetApplicationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetApplicationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetApplicationRequest.
 	}
 	resp, err := c.GetApplication(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/ApplicationsClient/RepairApplication/main.go b/internal/generated/snippets/appengine/apiv1/ApplicationsClient/RepairApplication/main.go
index 62404b6e67c..26be06ba7e0 100644
--- a/internal/generated/snippets/appengine/apiv1/ApplicationsClient/RepairApplication/main.go
+++ b/internal/generated/snippets/appengine/apiv1/ApplicationsClient/RepairApplication/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &appenginepb.RepairApplicationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#RepairApplicationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#RepairApplicationRequest.
 	}
 	op, err := c.RepairApplication(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/ApplicationsClient/UpdateApplication/main.go b/internal/generated/snippets/appengine/apiv1/ApplicationsClient/UpdateApplication/main.go
index fbbfb652be4..f8204460368 100644
--- a/internal/generated/snippets/appengine/apiv1/ApplicationsClient/UpdateApplication/main.go
+++ b/internal/generated/snippets/appengine/apiv1/ApplicationsClient/UpdateApplication/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &appenginepb.UpdateApplicationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateApplicationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateApplicationRequest.
 	}
 	op, err := c.UpdateApplication(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/CreateAuthorizedCertificate/main.go b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/CreateAuthorizedCertificate/main.go
index 4e949e3ec23..4cf0373f092 100644
--- a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/CreateAuthorizedCertificate/main.go
+++ b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/CreateAuthorizedCertificate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.CreateAuthorizedCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateAuthorizedCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateAuthorizedCertificateRequest.
 	}
 	resp, err := c.CreateAuthorizedCertificate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/DeleteAuthorizedCertificate/main.go b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/DeleteAuthorizedCertificate/main.go
index 0bb4a003527..1394d7c58bf 100644
--- a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/DeleteAuthorizedCertificate/main.go
+++ b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/DeleteAuthorizedCertificate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.DeleteAuthorizedCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteAuthorizedCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteAuthorizedCertificateRequest.
 	}
 	err = c.DeleteAuthorizedCertificate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/GetAuthorizedCertificate/main.go b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/GetAuthorizedCertificate/main.go
index 71b2d716dff..8d97c01eecd 100644
--- a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/GetAuthorizedCertificate/main.go
+++ b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/GetAuthorizedCertificate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.GetAuthorizedCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetAuthorizedCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetAuthorizedCertificateRequest.
 	}
 	resp, err := c.GetAuthorizedCertificate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/ListAuthorizedCertificates/main.go b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/ListAuthorizedCertificates/main.go
index 3f40321f8e5..12d67490ecf 100644
--- a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/ListAuthorizedCertificates/main.go
+++ b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/ListAuthorizedCertificates/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appenginepb.ListAuthorizedCertificatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListAuthorizedCertificatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListAuthorizedCertificatesRequest.
 	}
 	it := c.ListAuthorizedCertificates(ctx, req)
 	for {
diff --git a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/UpdateAuthorizedCertificate/main.go b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/UpdateAuthorizedCertificate/main.go
index c28d1a6bf9f..ba8ce31a9f4 100644
--- a/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/UpdateAuthorizedCertificate/main.go
+++ b/internal/generated/snippets/appengine/apiv1/AuthorizedCertificatesClient/UpdateAuthorizedCertificate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.UpdateAuthorizedCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateAuthorizedCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateAuthorizedCertificateRequest.
 	}
 	resp, err := c.UpdateAuthorizedCertificate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/AuthorizedDomainsClient/ListAuthorizedDomains/main.go b/internal/generated/snippets/appengine/apiv1/AuthorizedDomainsClient/ListAuthorizedDomains/main.go
index 82d3fea01d0..f047b7b776a 100644
--- a/internal/generated/snippets/appengine/apiv1/AuthorizedDomainsClient/ListAuthorizedDomains/main.go
+++ b/internal/generated/snippets/appengine/apiv1/AuthorizedDomainsClient/ListAuthorizedDomains/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appenginepb.ListAuthorizedDomainsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListAuthorizedDomainsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListAuthorizedDomainsRequest.
 	}
 	it := c.ListAuthorizedDomains(ctx, req)
 	for {
diff --git a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/CreateDomainMapping/main.go b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/CreateDomainMapping/main.go
index 5e24cc06b75..67753afb9f9 100644
--- a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/CreateDomainMapping/main.go
+++ b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/CreateDomainMapping/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.CreateDomainMappingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateDomainMappingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateDomainMappingRequest.
 	}
 	op, err := c.CreateDomainMapping(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/DeleteDomainMapping/main.go b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/DeleteDomainMapping/main.go
index d142f1c69d0..484923cdfc6 100644
--- a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/DeleteDomainMapping/main.go
+++ b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/DeleteDomainMapping/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.DeleteDomainMappingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteDomainMappingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteDomainMappingRequest.
 	}
 	op, err := c.DeleteDomainMapping(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/GetDomainMapping/main.go b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/GetDomainMapping/main.go
index 743ea740731..9574da39199 100644
--- a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/GetDomainMapping/main.go
+++ b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/GetDomainMapping/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.GetDomainMappingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetDomainMappingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetDomainMappingRequest.
 	}
 	resp, err := c.GetDomainMapping(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/ListDomainMappings/main.go b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/ListDomainMappings/main.go
index e2fcacc79da..5f5ee0a20aa 100644
--- a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/ListDomainMappings/main.go
+++ b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/ListDomainMappings/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appenginepb.ListDomainMappingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListDomainMappingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListDomainMappingsRequest.
 	}
 	it := c.ListDomainMappings(ctx, req)
 	for {
diff --git a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/UpdateDomainMapping/main.go b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/UpdateDomainMapping/main.go
index b078ca33959..9b3b8521968 100644
--- a/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/UpdateDomainMapping/main.go
+++ b/internal/generated/snippets/appengine/apiv1/DomainMappingsClient/UpdateDomainMapping/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.UpdateDomainMappingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateDomainMappingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateDomainMappingRequest.
 	}
 	op, err := c.UpdateDomainMapping(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/FirewallClient/BatchUpdateIngressRules/main.go b/internal/generated/snippets/appengine/apiv1/FirewallClient/BatchUpdateIngressRules/main.go
index 7984db0b78f..46fc0e81c08 100644
--- a/internal/generated/snippets/appengine/apiv1/FirewallClient/BatchUpdateIngressRules/main.go
+++ b/internal/generated/snippets/appengine/apiv1/FirewallClient/BatchUpdateIngressRules/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.BatchUpdateIngressRulesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#BatchUpdateIngressRulesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#BatchUpdateIngressRulesRequest.
 	}
 	resp, err := c.BatchUpdateIngressRules(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/FirewallClient/CreateIngressRule/main.go b/internal/generated/snippets/appengine/apiv1/FirewallClient/CreateIngressRule/main.go
index 86ef96f46e1..6b7d915c007 100644
--- a/internal/generated/snippets/appengine/apiv1/FirewallClient/CreateIngressRule/main.go
+++ b/internal/generated/snippets/appengine/apiv1/FirewallClient/CreateIngressRule/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.CreateIngressRuleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateIngressRuleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateIngressRuleRequest.
 	}
 	resp, err := c.CreateIngressRule(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/FirewallClient/DeleteIngressRule/main.go b/internal/generated/snippets/appengine/apiv1/FirewallClient/DeleteIngressRule/main.go
index bdff8fe6742..4c639a65f8f 100644
--- a/internal/generated/snippets/appengine/apiv1/FirewallClient/DeleteIngressRule/main.go
+++ b/internal/generated/snippets/appengine/apiv1/FirewallClient/DeleteIngressRule/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.DeleteIngressRuleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteIngressRuleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteIngressRuleRequest.
 	}
 	err = c.DeleteIngressRule(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/FirewallClient/GetIngressRule/main.go b/internal/generated/snippets/appengine/apiv1/FirewallClient/GetIngressRule/main.go
index a78daad7daf..c67adc3ba77 100644
--- a/internal/generated/snippets/appengine/apiv1/FirewallClient/GetIngressRule/main.go
+++ b/internal/generated/snippets/appengine/apiv1/FirewallClient/GetIngressRule/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.GetIngressRuleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetIngressRuleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetIngressRuleRequest.
 	}
 	resp, err := c.GetIngressRule(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/FirewallClient/ListIngressRules/main.go b/internal/generated/snippets/appengine/apiv1/FirewallClient/ListIngressRules/main.go
index 92b2dfcffa4..000980f6aa6 100644
--- a/internal/generated/snippets/appengine/apiv1/FirewallClient/ListIngressRules/main.go
+++ b/internal/generated/snippets/appengine/apiv1/FirewallClient/ListIngressRules/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appenginepb.ListIngressRulesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListIngressRulesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListIngressRulesRequest.
 	}
 	it := c.ListIngressRules(ctx, req)
 	for {
diff --git a/internal/generated/snippets/appengine/apiv1/FirewallClient/UpdateIngressRule/main.go b/internal/generated/snippets/appengine/apiv1/FirewallClient/UpdateIngressRule/main.go
index 6cc4825f0e4..88d0a5f806b 100644
--- a/internal/generated/snippets/appengine/apiv1/FirewallClient/UpdateIngressRule/main.go
+++ b/internal/generated/snippets/appengine/apiv1/FirewallClient/UpdateIngressRule/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.UpdateIngressRuleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateIngressRuleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateIngressRuleRequest.
 	}
 	resp, err := c.UpdateIngressRule(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/InstancesClient/DebugInstance/main.go b/internal/generated/snippets/appengine/apiv1/InstancesClient/DebugInstance/main.go
index d63e95f3094..08f1d204d86 100644
--- a/internal/generated/snippets/appengine/apiv1/InstancesClient/DebugInstance/main.go
+++ b/internal/generated/snippets/appengine/apiv1/InstancesClient/DebugInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.DebugInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DebugInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DebugInstanceRequest.
 	}
 	op, err := c.DebugInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/InstancesClient/DeleteInstance/main.go b/internal/generated/snippets/appengine/apiv1/InstancesClient/DeleteInstance/main.go
index 3319a5004d0..59820227a0c 100644
--- a/internal/generated/snippets/appengine/apiv1/InstancesClient/DeleteInstance/main.go
+++ b/internal/generated/snippets/appengine/apiv1/InstancesClient/DeleteInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/InstancesClient/GetInstance/main.go b/internal/generated/snippets/appengine/apiv1/InstancesClient/GetInstance/main.go
index 9831fabe55a..1a6cf940bf1 100644
--- a/internal/generated/snippets/appengine/apiv1/InstancesClient/GetInstance/main.go
+++ b/internal/generated/snippets/appengine/apiv1/InstancesClient/GetInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/InstancesClient/ListInstances/main.go b/internal/generated/snippets/appengine/apiv1/InstancesClient/ListInstances/main.go
index aa3e8551597..d7ee76a6e8b 100644
--- a/internal/generated/snippets/appengine/apiv1/InstancesClient/ListInstances/main.go
+++ b/internal/generated/snippets/appengine/apiv1/InstancesClient/ListInstances/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appenginepb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
diff --git a/internal/generated/snippets/appengine/apiv1/ServicesClient/DeleteService/main.go b/internal/generated/snippets/appengine/apiv1/ServicesClient/DeleteService/main.go
index e62e15336cc..67ac8098fe8 100644
--- a/internal/generated/snippets/appengine/apiv1/ServicesClient/DeleteService/main.go
+++ b/internal/generated/snippets/appengine/apiv1/ServicesClient/DeleteService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.DeleteServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteServiceRequest.
 	}
 	op, err := c.DeleteService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/ServicesClient/GetService/main.go b/internal/generated/snippets/appengine/apiv1/ServicesClient/GetService/main.go
index b55d724f964..38673bd5c43 100644
--- a/internal/generated/snippets/appengine/apiv1/ServicesClient/GetService/main.go
+++ b/internal/generated/snippets/appengine/apiv1/ServicesClient/GetService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.GetServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetServiceRequest.
 	}
 	resp, err := c.GetService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/ServicesClient/ListServices/main.go b/internal/generated/snippets/appengine/apiv1/ServicesClient/ListServices/main.go
index 62da91d75d2..859aa121f46 100644
--- a/internal/generated/snippets/appengine/apiv1/ServicesClient/ListServices/main.go
+++ b/internal/generated/snippets/appengine/apiv1/ServicesClient/ListServices/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appenginepb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
diff --git a/internal/generated/snippets/appengine/apiv1/ServicesClient/UpdateService/main.go b/internal/generated/snippets/appengine/apiv1/ServicesClient/UpdateService/main.go
index 23b332aa943..90e61c56f85 100644
--- a/internal/generated/snippets/appengine/apiv1/ServicesClient/UpdateService/main.go
+++ b/internal/generated/snippets/appengine/apiv1/ServicesClient/UpdateService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.UpdateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateServiceRequest.
 	}
 	op, err := c.UpdateService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/VersionsClient/CreateVersion/main.go b/internal/generated/snippets/appengine/apiv1/VersionsClient/CreateVersion/main.go
index c387e537810..2c82b3c45ba 100644
--- a/internal/generated/snippets/appengine/apiv1/VersionsClient/CreateVersion/main.go
+++ b/internal/generated/snippets/appengine/apiv1/VersionsClient/CreateVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.CreateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#CreateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#CreateVersionRequest.
 	}
 	op, err := c.CreateVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/VersionsClient/DeleteVersion/main.go b/internal/generated/snippets/appengine/apiv1/VersionsClient/DeleteVersion/main.go
index fd21880ee80..4a91ec1e36a 100644
--- a/internal/generated/snippets/appengine/apiv1/VersionsClient/DeleteVersion/main.go
+++ b/internal/generated/snippets/appengine/apiv1/VersionsClient/DeleteVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.DeleteVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#DeleteVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#DeleteVersionRequest.
 	}
 	op, err := c.DeleteVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/VersionsClient/GetVersion/main.go b/internal/generated/snippets/appengine/apiv1/VersionsClient/GetVersion/main.go
index 11b7d15e5fc..1e495d89668 100644
--- a/internal/generated/snippets/appengine/apiv1/VersionsClient/GetVersion/main.go
+++ b/internal/generated/snippets/appengine/apiv1/VersionsClient/GetVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.GetVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#GetVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#GetVersionRequest.
 	}
 	resp, err := c.GetVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/VersionsClient/ListVersions/main.go b/internal/generated/snippets/appengine/apiv1/VersionsClient/ListVersions/main.go
index 506de6a1f56..b6c418e2328 100644
--- a/internal/generated/snippets/appengine/apiv1/VersionsClient/ListVersions/main.go
+++ b/internal/generated/snippets/appengine/apiv1/VersionsClient/ListVersions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 	"google.golang.org/api/iterator"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appenginepb.ListVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#ListVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#ListVersionsRequest.
 	}
 	it := c.ListVersions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/appengine/apiv1/VersionsClient/UpdateVersion/main.go b/internal/generated/snippets/appengine/apiv1/VersionsClient/UpdateVersion/main.go
index 58e93b418d9..7a04d2e067d 100644
--- a/internal/generated/snippets/appengine/apiv1/VersionsClient/UpdateVersion/main.go
+++ b/internal/generated/snippets/appengine/apiv1/VersionsClient/UpdateVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appengine "cloud.google.com/go/appengine/apiv1"
-
-	appenginepb "google.golang.org/genproto/googleapis/appengine/v1"
+	appenginepb "cloud.google.com/go/appengine/apiv1/appenginepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appenginepb.UpdateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/appengine/v1#UpdateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/appengine/apiv1/appenginepb#UpdateVersionRequest.
 	}
 	op, err := c.UpdateVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/appengine/apiv1/snippet_metadata.google.appengine.v1.json b/internal/generated/snippets/appengine/apiv1/snippet_metadata.google.appengine.v1.json
index 9fa3727ff5f..5361561bafb 100644
--- a/internal/generated/snippets/appengine/apiv1/snippet_metadata.google.appengine.v1.json
+++ b/internal/generated/snippets/appengine/apiv1/snippet_metadata.google.appengine.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/appengine/apiv1",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "language": "GO",
     "apis": [
       {
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -419,7 +419,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -465,7 +465,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -511,7 +511,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -557,7 +557,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -603,7 +603,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -649,7 +649,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -695,7 +695,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -741,7 +741,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -787,7 +787,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -832,7 +832,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -878,7 +878,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -924,7 +924,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -970,7 +970,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1016,7 +1016,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1062,7 +1062,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -1108,7 +1108,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1154,7 +1154,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1200,7 +1200,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -1246,7 +1246,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1292,7 +1292,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1338,7 +1338,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1384,7 +1384,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1430,7 +1430,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -1476,7 +1476,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1522,7 +1522,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1568,7 +1568,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/CreateRepository/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/CreateRepository/main.go
index 7c6237c765b..f7955ee6506 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/CreateRepository/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/CreateRepository/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.CreateRepositoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#CreateRepositoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#CreateRepositoryRequest.
 	}
 	op, err := c.CreateRepository(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/CreateTag/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/CreateTag/main.go
index c06ee0147fb..dc6f8035872 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/CreateTag/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/CreateTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.CreateTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#CreateTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#CreateTagRequest.
 	}
 	resp, err := c.CreateTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/DeletePackage/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/DeletePackage/main.go
index 3adb12b6b0a..dc4397bf8a0 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/DeletePackage/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/DeletePackage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.DeletePackageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#DeletePackageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#DeletePackageRequest.
 	}
 	op, err := c.DeletePackage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteRepository/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteRepository/main.go
index 90ecc9ae212..92720290cd6 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteRepository/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteRepository/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.DeleteRepositoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#DeleteRepositoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#DeleteRepositoryRequest.
 	}
 	op, err := c.DeleteRepository(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteTag/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteTag/main.go
index fe141739ca2..3d93eec42c1 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteTag/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.DeleteTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#DeleteTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#DeleteTagRequest.
 	}
 	err = c.DeleteTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteVersion/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteVersion/main.go
index 2762623f17b..c9ceba6e7fe 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteVersion/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/DeleteVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.DeleteVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#DeleteVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#DeleteVersionRequest.
 	}
 	op, err := c.DeleteVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/GetDockerImage/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/GetDockerImage/main.go
index 7a0749a48f3..37efdbb51bb 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/GetDockerImage/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/GetDockerImage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.GetDockerImageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetDockerImageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetDockerImageRequest.
 	}
 	resp, err := c.GetDockerImage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/GetFile/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/GetFile/main.go
index a31f9920ef7..85965da4c6b 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/GetFile/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/GetFile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.GetFileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetFileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetFileRequest.
 	}
 	resp, err := c.GetFile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/GetPackage/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/GetPackage/main.go
index 06cce29adb2..942bd50c2e4 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/GetPackage/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/GetPackage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.GetPackageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetPackageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetPackageRequest.
 	}
 	resp, err := c.GetPackage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/GetProjectSettings/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/GetProjectSettings/main.go
index 559e1862163..3e90728539b 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/GetProjectSettings/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/GetProjectSettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.GetProjectSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetProjectSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetProjectSettingsRequest.
 	}
 	resp, err := c.GetProjectSettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/GetRepository/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/GetRepository/main.go
index 68536fa8c96..313a34a199d 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/GetRepository/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/GetRepository/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.GetRepositoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetRepositoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetRepositoryRequest.
 	}
 	resp, err := c.GetRepository(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/GetTag/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/GetTag/main.go
index 1d19579bf26..6cb9073db1f 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/GetTag/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/GetTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.GetTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetTagRequest.
 	}
 	resp, err := c.GetTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/GetVersion/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/GetVersion/main.go
index aadba6a9031..0c8c3207c3b 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/GetVersion/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/GetVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.GetVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#GetVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#GetVersionRequest.
 	}
 	resp, err := c.GetVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/ImportAptArtifacts/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/ImportAptArtifacts/main.go
index e2c0337ade8..6e92b4d2737 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/ImportAptArtifacts/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/ImportAptArtifacts/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.ImportAptArtifactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ImportAptArtifactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ImportAptArtifactsRequest.
 	}
 	op, err := c.ImportAptArtifacts(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/ImportYumArtifacts/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/ImportYumArtifacts/main.go
index dfe14467897..6581a19c07e 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/ImportYumArtifacts/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/ImportYumArtifacts/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.ImportYumArtifactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ImportYumArtifactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ImportYumArtifactsRequest.
 	}
 	op, err := c.ImportYumArtifacts(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/ListDockerImages/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/ListDockerImages/main.go
index 8d366cf3629..08f2fd62884 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/ListDockerImages/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/ListDockerImages/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 	"google.golang.org/api/iterator"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &artifactregistrypb.ListDockerImagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListDockerImagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListDockerImagesRequest.
 	}
 	it := c.ListDockerImages(ctx, req)
 	for {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/ListFiles/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/ListFiles/main.go
index f33c1407e95..9c8deb51d64 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/ListFiles/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/ListFiles/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 	"google.golang.org/api/iterator"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &artifactregistrypb.ListFilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListFilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListFilesRequest.
 	}
 	it := c.ListFiles(ctx, req)
 	for {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/ListPackages/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/ListPackages/main.go
index d583051281c..476cae38d09 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/ListPackages/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/ListPackages/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 	"google.golang.org/api/iterator"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &artifactregistrypb.ListPackagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListPackagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListPackagesRequest.
 	}
 	it := c.ListPackages(ctx, req)
 	for {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/ListRepositories/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/ListRepositories/main.go
index 064de0b879d..1d222b5c794 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/ListRepositories/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/ListRepositories/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 	"google.golang.org/api/iterator"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &artifactregistrypb.ListRepositoriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListRepositoriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListRepositoriesRequest.
 	}
 	it := c.ListRepositories(ctx, req)
 	for {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/ListTags/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/ListTags/main.go
index 1e8bfb970fc..228734fda60 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/ListTags/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/ListTags/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 	"google.golang.org/api/iterator"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &artifactregistrypb.ListTagsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListTagsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListTagsRequest.
 	}
 	it := c.ListTags(ctx, req)
 	for {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/ListVersions/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/ListVersions/main.go
index fc452129deb..c2aa9c5e930 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/ListVersions/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/ListVersions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 	"google.golang.org/api/iterator"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &artifactregistrypb.ListVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#ListVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#ListVersionsRequest.
 	}
 	it := c.ListVersions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateProjectSettings/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateProjectSettings/main.go
index d1d40a88ae9..41ca412e573 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateProjectSettings/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateProjectSettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.UpdateProjectSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#UpdateProjectSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#UpdateProjectSettingsRequest.
 	}
 	resp, err := c.UpdateProjectSettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateRepository/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateRepository/main.go
index 36e416ad723..dd659353904 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateRepository/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateRepository/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.UpdateRepositoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#UpdateRepositoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#UpdateRepositoryRequest.
 	}
 	resp, err := c.UpdateRepository(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateTag/main.go b/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateTag/main.go
index e8f868ca7d1..5b25b53867f 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateTag/main.go
+++ b/internal/generated/snippets/artifactregistry/apiv1/Client/UpdateTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	artifactregistry "cloud.google.com/go/artifactregistry/apiv1"
-
-	artifactregistrypb "google.golang.org/genproto/googleapis/devtools/artifactregistry/v1"
+	artifactregistrypb "cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &artifactregistrypb.UpdateTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/artifactregistry/v1#UpdateTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/artifactregistry/apiv1/artifactregistrypb#UpdateTagRequest.
 	}
 	resp, err := c.UpdateTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/artifactregistry/apiv1/snippet_metadata.google.devtools.artifactregistry.v1.json b/internal/generated/snippets/artifactregistry/apiv1/snippet_metadata.google.devtools.artifactregistry.v1.json
index 2c617e34be3..a76bb30d6c9 100644
--- a/internal/generated/snippets/artifactregistry/apiv1/snippet_metadata.google.devtools.artifactregistry.v1.json
+++ b/internal/generated/snippets/artifactregistry/apiv1/snippet_metadata.google.devtools.artifactregistry.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/artifactregistry/apiv1",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -465,7 +465,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -511,7 +511,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -557,7 +557,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -603,7 +603,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -649,7 +649,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -695,7 +695,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -741,7 +741,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -787,7 +787,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -833,7 +833,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -879,7 +879,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -925,7 +925,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -971,7 +971,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1017,7 +1017,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1155,7 +1155,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1201,7 +1201,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1247,7 +1247,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/artifactregistry/apiv1beta2/snippet_metadata.google.devtools.artifactregistry.v1beta2.json b/internal/generated/snippets/artifactregistry/apiv1beta2/snippet_metadata.google.devtools.artifactregistry.v1beta2.json
index 8ab9bec8a10..299c4482118 100644
--- a/internal/generated/snippets/artifactregistry/apiv1beta2/snippet_metadata.google.devtools.artifactregistry.v1beta2.json
+++ b/internal/generated/snippets/artifactregistry/apiv1beta2/snippet_metadata.google.devtools.artifactregistry.v1beta2.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/artifactregistry/apiv1beta2",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/asset/apiv1/Client/AnalyzeIamPolicy/main.go b/internal/generated/snippets/asset/apiv1/Client/AnalyzeIamPolicy/main.go
index 2436296bda9..00e343bf788 100644
--- a/internal/generated/snippets/asset/apiv1/Client/AnalyzeIamPolicy/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/AnalyzeIamPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.AnalyzeIamPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#AnalyzeIamPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#AnalyzeIamPolicyRequest.
 	}
 	resp, err := c.AnalyzeIamPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/AnalyzeIamPolicyLongrunning/main.go b/internal/generated/snippets/asset/apiv1/Client/AnalyzeIamPolicyLongrunning/main.go
index 84420104edb..21d8b6aa4c6 100644
--- a/internal/generated/snippets/asset/apiv1/Client/AnalyzeIamPolicyLongrunning/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/AnalyzeIamPolicyLongrunning/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.AnalyzeIamPolicyLongrunningRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#AnalyzeIamPolicyLongrunningRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#AnalyzeIamPolicyLongrunningRequest.
 	}
 	op, err := c.AnalyzeIamPolicyLongrunning(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/AnalyzeMove/main.go b/internal/generated/snippets/asset/apiv1/Client/AnalyzeMove/main.go
index 94016b4ec01..b88fbfbabab 100644
--- a/internal/generated/snippets/asset/apiv1/Client/AnalyzeMove/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/AnalyzeMove/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.AnalyzeMoveRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#AnalyzeMoveRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#AnalyzeMoveRequest.
 	}
 	resp, err := c.AnalyzeMove(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/BatchGetAssetsHistory/main.go b/internal/generated/snippets/asset/apiv1/Client/BatchGetAssetsHistory/main.go
index 3a2ecf39b76..8240366df82 100644
--- a/internal/generated/snippets/asset/apiv1/Client/BatchGetAssetsHistory/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/BatchGetAssetsHistory/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.BatchGetAssetsHistoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#BatchGetAssetsHistoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#BatchGetAssetsHistoryRequest.
 	}
 	resp, err := c.BatchGetAssetsHistory(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/BatchGetEffectiveIamPolicies/main.go b/internal/generated/snippets/asset/apiv1/Client/BatchGetEffectiveIamPolicies/main.go
index fb3e24808bb..259b3627c10 100644
--- a/internal/generated/snippets/asset/apiv1/Client/BatchGetEffectiveIamPolicies/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/BatchGetEffectiveIamPolicies/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.BatchGetEffectiveIamPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#BatchGetEffectiveIamPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#BatchGetEffectiveIamPoliciesRequest.
 	}
 	resp, err := c.BatchGetEffectiveIamPolicies(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/CreateFeed/main.go b/internal/generated/snippets/asset/apiv1/Client/CreateFeed/main.go
index f531e511201..6424bc35813 100644
--- a/internal/generated/snippets/asset/apiv1/Client/CreateFeed/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/CreateFeed/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.CreateFeedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#CreateFeedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#CreateFeedRequest.
 	}
 	resp, err := c.CreateFeed(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/CreateSavedQuery/main.go b/internal/generated/snippets/asset/apiv1/Client/CreateSavedQuery/main.go
index 6f84a0b87fe..e71ecab5801 100644
--- a/internal/generated/snippets/asset/apiv1/Client/CreateSavedQuery/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/CreateSavedQuery/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.CreateSavedQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#CreateSavedQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#CreateSavedQueryRequest.
 	}
 	resp, err := c.CreateSavedQuery(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/DeleteFeed/main.go b/internal/generated/snippets/asset/apiv1/Client/DeleteFeed/main.go
index 784ae08b459..0ace9e33eb0 100644
--- a/internal/generated/snippets/asset/apiv1/Client/DeleteFeed/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/DeleteFeed/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.DeleteFeedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#DeleteFeedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#DeleteFeedRequest.
 	}
 	err = c.DeleteFeed(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/DeleteSavedQuery/main.go b/internal/generated/snippets/asset/apiv1/Client/DeleteSavedQuery/main.go
index d02aa19bce1..5fb37d12f7e 100644
--- a/internal/generated/snippets/asset/apiv1/Client/DeleteSavedQuery/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/DeleteSavedQuery/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.DeleteSavedQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#DeleteSavedQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#DeleteSavedQueryRequest.
 	}
 	err = c.DeleteSavedQuery(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/ExportAssets/main.go b/internal/generated/snippets/asset/apiv1/Client/ExportAssets/main.go
index 9abfdd1857e..e054345be74 100644
--- a/internal/generated/snippets/asset/apiv1/Client/ExportAssets/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/ExportAssets/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.ExportAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ExportAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ExportAssetsRequest.
 	}
 	op, err := c.ExportAssets(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/GetFeed/main.go b/internal/generated/snippets/asset/apiv1/Client/GetFeed/main.go
index 4252e415901..476eee0d429 100644
--- a/internal/generated/snippets/asset/apiv1/Client/GetFeed/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/GetFeed/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.GetFeedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#GetFeedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#GetFeedRequest.
 	}
 	resp, err := c.GetFeed(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/GetSavedQuery/main.go b/internal/generated/snippets/asset/apiv1/Client/GetSavedQuery/main.go
index 29ce2a2d241..89418c044d1 100644
--- a/internal/generated/snippets/asset/apiv1/Client/GetSavedQuery/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/GetSavedQuery/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.GetSavedQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#GetSavedQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#GetSavedQueryRequest.
 	}
 	resp, err := c.GetSavedQuery(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/ListAssets/main.go b/internal/generated/snippets/asset/apiv1/Client/ListAssets/main.go
index 5d360390af8..76ab7876bd6 100644
--- a/internal/generated/snippets/asset/apiv1/Client/ListAssets/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/ListAssets/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 	"google.golang.org/api/iterator"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &assetpb.ListAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ListAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ListAssetsRequest.
 	}
 	it := c.ListAssets(ctx, req)
 	for {
diff --git a/internal/generated/snippets/asset/apiv1/Client/ListFeeds/main.go b/internal/generated/snippets/asset/apiv1/Client/ListFeeds/main.go
index 65e20f51fd6..c251b155952 100644
--- a/internal/generated/snippets/asset/apiv1/Client/ListFeeds/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/ListFeeds/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.ListFeedsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ListFeedsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ListFeedsRequest.
 	}
 	resp, err := c.ListFeeds(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/ListSavedQueries/main.go b/internal/generated/snippets/asset/apiv1/Client/ListSavedQueries/main.go
index 306b36fe68d..3f922570067 100644
--- a/internal/generated/snippets/asset/apiv1/Client/ListSavedQueries/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/ListSavedQueries/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 	"google.golang.org/api/iterator"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &assetpb.ListSavedQueriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#ListSavedQueriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#ListSavedQueriesRequest.
 	}
 	it := c.ListSavedQueries(ctx, req)
 	for {
diff --git a/internal/generated/snippets/asset/apiv1/Client/QueryAssets/main.go b/internal/generated/snippets/asset/apiv1/Client/QueryAssets/main.go
index 42954a02797..2d76edf948e 100644
--- a/internal/generated/snippets/asset/apiv1/Client/QueryAssets/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/QueryAssets/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.QueryAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#QueryAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#QueryAssetsRequest.
 	}
 	resp, err := c.QueryAssets(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/SearchAllIamPolicies/main.go b/internal/generated/snippets/asset/apiv1/Client/SearchAllIamPolicies/main.go
index c25e6f732c9..610009872b1 100644
--- a/internal/generated/snippets/asset/apiv1/Client/SearchAllIamPolicies/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/SearchAllIamPolicies/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 	"google.golang.org/api/iterator"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &assetpb.SearchAllIamPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#SearchAllIamPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#SearchAllIamPoliciesRequest.
 	}
 	it := c.SearchAllIamPolicies(ctx, req)
 	for {
diff --git a/internal/generated/snippets/asset/apiv1/Client/SearchAllResources/main.go b/internal/generated/snippets/asset/apiv1/Client/SearchAllResources/main.go
index 3abd999af31..60d33c8f556 100644
--- a/internal/generated/snippets/asset/apiv1/Client/SearchAllResources/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/SearchAllResources/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 	"google.golang.org/api/iterator"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &assetpb.SearchAllResourcesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#SearchAllResourcesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#SearchAllResourcesRequest.
 	}
 	it := c.SearchAllResources(ctx, req)
 	for {
diff --git a/internal/generated/snippets/asset/apiv1/Client/UpdateFeed/main.go b/internal/generated/snippets/asset/apiv1/Client/UpdateFeed/main.go
index 67949d646ca..66310471474 100644
--- a/internal/generated/snippets/asset/apiv1/Client/UpdateFeed/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/UpdateFeed/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.UpdateFeedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#UpdateFeedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#UpdateFeedRequest.
 	}
 	resp, err := c.UpdateFeed(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/Client/UpdateSavedQuery/main.go b/internal/generated/snippets/asset/apiv1/Client/UpdateSavedQuery/main.go
index 27eaeeb9a6d..b11c9fd7df1 100644
--- a/internal/generated/snippets/asset/apiv1/Client/UpdateSavedQuery/main.go
+++ b/internal/generated/snippets/asset/apiv1/Client/UpdateSavedQuery/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	asset "cloud.google.com/go/asset/apiv1"
-
-	assetpb "google.golang.org/genproto/googleapis/cloud/asset/v1"
+	assetpb "cloud.google.com/go/asset/apiv1/assetpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assetpb.UpdateSavedQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/asset/v1#UpdateSavedQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/asset/apiv1/assetpb#UpdateSavedQueryRequest.
 	}
 	resp, err := c.UpdateSavedQuery(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/asset/apiv1/snippet_metadata.google.cloud.asset.v1.json b/internal/generated/snippets/asset/apiv1/snippet_metadata.google.cloud.asset.v1.json
index b00710963fc..70f5c8ced25 100644
--- a/internal/generated/snippets/asset/apiv1/snippet_metadata.google.cloud.asset.v1.json
+++ b/internal/generated/snippets/asset/apiv1/snippet_metadata.google.cloud.asset.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/asset/apiv1",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -464,7 +464,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -510,7 +510,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -648,7 +648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -694,7 +694,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -740,7 +740,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -786,7 +786,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -832,7 +832,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -878,7 +878,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -924,7 +924,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -970,7 +970,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/asset/apiv1p2beta1/snippet_metadata.google.cloud.asset.v1p2beta1.json b/internal/generated/snippets/asset/apiv1p2beta1/snippet_metadata.google.cloud.asset.v1p2beta1.json
index 8ce1a91668c..b9a28930aa1 100644
--- a/internal/generated/snippets/asset/apiv1p2beta1/snippet_metadata.google.cloud.asset.v1p2beta1.json
+++ b/internal/generated/snippets/asset/apiv1p2beta1/snippet_metadata.google.cloud.asset.v1p2beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/asset/apiv1p2beta1",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/asset/apiv1p5beta1/snippet_metadata.google.cloud.asset.v1p5beta1.json b/internal/generated/snippets/asset/apiv1p5beta1/snippet_metadata.google.cloud.asset.v1p5beta1.json
index aedd6889add..e545c320378 100644
--- a/internal/generated/snippets/asset/apiv1p5beta1/snippet_metadata.google.cloud.asset.v1p5beta1.json
+++ b/internal/generated/snippets/asset/apiv1p5beta1/snippet_metadata.google.cloud.asset.v1p5beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/asset/apiv1p5beta1",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/AcknowledgeViolation/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/AcknowledgeViolation/main.go
index b508840eaa0..267c6cfbffd 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/AcknowledgeViolation/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/AcknowledgeViolation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assuredworkloadspb.AcknowledgeViolationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#AcknowledgeViolationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#AcknowledgeViolationRequest.
 	}
 	resp, err := c.AcknowledgeViolation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/CreateWorkload/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/CreateWorkload/main.go
index 7e5c0f2baae..0fe5a8bae6e 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/CreateWorkload/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/CreateWorkload/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assuredworkloadspb.CreateWorkloadRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#CreateWorkloadRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#CreateWorkloadRequest.
 	}
 	op, err := c.CreateWorkload(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/DeleteWorkload/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/DeleteWorkload/main.go
index 560d0733b63..a09931d4b05 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/DeleteWorkload/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/DeleteWorkload/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assuredworkloadspb.DeleteWorkloadRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#DeleteWorkloadRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#DeleteWorkloadRequest.
 	}
 	err = c.DeleteWorkload(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/GetViolation/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/GetViolation/main.go
index 05fe1ef4b59..1e922d4b478 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/GetViolation/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/GetViolation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assuredworkloadspb.GetViolationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#GetViolationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#GetViolationRequest.
 	}
 	resp, err := c.GetViolation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/GetWorkload/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/GetWorkload/main.go
index 2d9e8c4ef3c..6d79f6000dc 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/GetWorkload/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/GetWorkload/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assuredworkloadspb.GetWorkloadRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#GetWorkloadRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#GetWorkloadRequest.
 	}
 	resp, err := c.GetWorkload(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/ListViolations/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/ListViolations/main.go
index 667343b2de0..d1f495bc7b5 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/ListViolations/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/ListViolations/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 	"google.golang.org/api/iterator"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &assuredworkloadspb.ListViolationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#ListViolationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#ListViolationsRequest.
 	}
 	it := c.ListViolations(ctx, req)
 	for {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/ListWorkloads/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/ListWorkloads/main.go
index 06bd805d981..cc2cd0154d7 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/ListWorkloads/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/ListWorkloads/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 	"google.golang.org/api/iterator"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &assuredworkloadspb.ListWorkloadsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#ListWorkloadsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#ListWorkloadsRequest.
 	}
 	it := c.ListWorkloads(ctx, req)
 	for {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/RestrictAllowedResources/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/RestrictAllowedResources/main.go
index d87216c7e11..2001fc77c3e 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/RestrictAllowedResources/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/RestrictAllowedResources/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assuredworkloadspb.RestrictAllowedResourcesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#RestrictAllowedResourcesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#RestrictAllowedResourcesRequest.
 	}
 	resp, err := c.RestrictAllowedResources(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/Client/UpdateWorkload/main.go b/internal/generated/snippets/assuredworkloads/apiv1/Client/UpdateWorkload/main.go
index f150cc64cc4..42e46887fb2 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/Client/UpdateWorkload/main.go
+++ b/internal/generated/snippets/assuredworkloads/apiv1/Client/UpdateWorkload/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	assuredworkloads "cloud.google.com/go/assuredworkloads/apiv1"
-
-	assuredworkloadspb "google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1"
+	assuredworkloadspb "cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &assuredworkloadspb.UpdateWorkloadRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/assuredworkloads/v1#UpdateWorkloadRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/assuredworkloads/apiv1/assuredworkloadspb#UpdateWorkloadRequest.
 	}
 	resp, err := c.UpdateWorkload(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/assuredworkloads/apiv1/snippet_metadata.google.cloud.assuredworkloads.v1.json b/internal/generated/snippets/assuredworkloads/apiv1/snippet_metadata.google.cloud.assuredworkloads.v1.json
index 9ad3946e0be..fc691b5f9c5 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1/snippet_metadata.google.cloud.assuredworkloads.v1.json
+++ b/internal/generated/snippets/assuredworkloads/apiv1/snippet_metadata.google.cloud.assuredworkloads.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/assuredworkloads/apiv1",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -419,7 +419,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -465,7 +465,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -511,7 +511,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/assuredworkloads/apiv1beta1/snippet_metadata.google.cloud.assuredworkloads.v1beta1.json b/internal/generated/snippets/assuredworkloads/apiv1beta1/snippet_metadata.google.cloud.assuredworkloads.v1beta1.json
index 349ffca8261..2631c697af0 100644
--- a/internal/generated/snippets/assuredworkloads/apiv1beta1/snippet_metadata.google.cloud.assuredworkloads.v1beta1.json
+++ b/internal/generated/snippets/assuredworkloads/apiv1beta1/snippet_metadata.google.cloud.assuredworkloads.v1beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/assuredworkloads/apiv1beta1",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/automl/apiv1/Client/CreateDataset/main.go b/internal/generated/snippets/automl/apiv1/Client/CreateDataset/main.go
index 7a7150022c0..1603d518efb 100644
--- a/internal/generated/snippets/automl/apiv1/Client/CreateDataset/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/CreateDataset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.CreateDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#CreateDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#CreateDatasetRequest.
 	}
 	op, err := c.CreateDataset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/CreateModel/main.go b/internal/generated/snippets/automl/apiv1/Client/CreateModel/main.go
index da5e51335bd..f25f04b5e8f 100644
--- a/internal/generated/snippets/automl/apiv1/Client/CreateModel/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/CreateModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.CreateModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#CreateModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#CreateModelRequest.
 	}
 	op, err := c.CreateModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/DeleteDataset/main.go b/internal/generated/snippets/automl/apiv1/Client/DeleteDataset/main.go
index 98225e6f1ab..0cfdf8c8e67 100644
--- a/internal/generated/snippets/automl/apiv1/Client/DeleteDataset/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/DeleteDataset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.DeleteDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#DeleteDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#DeleteDatasetRequest.
 	}
 	op, err := c.DeleteDataset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/DeleteModel/main.go b/internal/generated/snippets/automl/apiv1/Client/DeleteModel/main.go
index 8790bcdd378..8318f3d5732 100644
--- a/internal/generated/snippets/automl/apiv1/Client/DeleteModel/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/DeleteModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.DeleteModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#DeleteModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#DeleteModelRequest.
 	}
 	op, err := c.DeleteModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/DeployModel/main.go b/internal/generated/snippets/automl/apiv1/Client/DeployModel/main.go
index b006899c253..50a65cf2d43 100644
--- a/internal/generated/snippets/automl/apiv1/Client/DeployModel/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/DeployModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.DeployModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#DeployModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#DeployModelRequest.
 	}
 	op, err := c.DeployModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/ExportData/main.go b/internal/generated/snippets/automl/apiv1/Client/ExportData/main.go
index 5d170b859e5..6b38a9992e2 100644
--- a/internal/generated/snippets/automl/apiv1/Client/ExportData/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/ExportData/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.ExportDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ExportDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ExportDataRequest.
 	}
 	op, err := c.ExportData(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/ExportModel/main.go b/internal/generated/snippets/automl/apiv1/Client/ExportModel/main.go
index 1cf114ac15f..1bf9aabdc18 100644
--- a/internal/generated/snippets/automl/apiv1/Client/ExportModel/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/ExportModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.ExportModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ExportModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ExportModelRequest.
 	}
 	op, err := c.ExportModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/GetAnnotationSpec/main.go b/internal/generated/snippets/automl/apiv1/Client/GetAnnotationSpec/main.go
index 2d71a2ab720..d19a9e2d155 100644
--- a/internal/generated/snippets/automl/apiv1/Client/GetAnnotationSpec/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/GetAnnotationSpec/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.GetAnnotationSpecRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#GetAnnotationSpecRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#GetAnnotationSpecRequest.
 	}
 	resp, err := c.GetAnnotationSpec(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/GetDataset/main.go b/internal/generated/snippets/automl/apiv1/Client/GetDataset/main.go
index a626f1e39b6..afbf4ee06fa 100644
--- a/internal/generated/snippets/automl/apiv1/Client/GetDataset/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/GetDataset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.GetDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#GetDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#GetDatasetRequest.
 	}
 	resp, err := c.GetDataset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/GetModel/main.go b/internal/generated/snippets/automl/apiv1/Client/GetModel/main.go
index ac271a3f984..1e3e09f7f36 100644
--- a/internal/generated/snippets/automl/apiv1/Client/GetModel/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/GetModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.GetModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#GetModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#GetModelRequest.
 	}
 	resp, err := c.GetModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/GetModelEvaluation/main.go b/internal/generated/snippets/automl/apiv1/Client/GetModelEvaluation/main.go
index 73b4e48a02f..682ca6ae606 100644
--- a/internal/generated/snippets/automl/apiv1/Client/GetModelEvaluation/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/GetModelEvaluation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.GetModelEvaluationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#GetModelEvaluationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#GetModelEvaluationRequest.
 	}
 	resp, err := c.GetModelEvaluation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/ImportData/main.go b/internal/generated/snippets/automl/apiv1/Client/ImportData/main.go
index 4e7b1b3651f..e3bb77f2945 100644
--- a/internal/generated/snippets/automl/apiv1/Client/ImportData/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/ImportData/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.ImportDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ImportDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ImportDataRequest.
 	}
 	op, err := c.ImportData(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/ListDatasets/main.go b/internal/generated/snippets/automl/apiv1/Client/ListDatasets/main.go
index d9622031c02..77a16bdb8d2 100644
--- a/internal/generated/snippets/automl/apiv1/Client/ListDatasets/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/ListDatasets/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 	"google.golang.org/api/iterator"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &automlpb.ListDatasetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ListDatasetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ListDatasetsRequest.
 	}
 	it := c.ListDatasets(ctx, req)
 	for {
diff --git a/internal/generated/snippets/automl/apiv1/Client/ListModelEvaluations/main.go b/internal/generated/snippets/automl/apiv1/Client/ListModelEvaluations/main.go
index bc728f7387f..9118e57dbc1 100644
--- a/internal/generated/snippets/automl/apiv1/Client/ListModelEvaluations/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/ListModelEvaluations/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 	"google.golang.org/api/iterator"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &automlpb.ListModelEvaluationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ListModelEvaluationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ListModelEvaluationsRequest.
 	}
 	it := c.ListModelEvaluations(ctx, req)
 	for {
diff --git a/internal/generated/snippets/automl/apiv1/Client/ListModels/main.go b/internal/generated/snippets/automl/apiv1/Client/ListModels/main.go
index d0be1ee6193..6bf6c27b737 100644
--- a/internal/generated/snippets/automl/apiv1/Client/ListModels/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/ListModels/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 	"google.golang.org/api/iterator"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &automlpb.ListModelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#ListModelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#ListModelsRequest.
 	}
 	it := c.ListModels(ctx, req)
 	for {
diff --git a/internal/generated/snippets/automl/apiv1/Client/UndeployModel/main.go b/internal/generated/snippets/automl/apiv1/Client/UndeployModel/main.go
index 23c1d7ced2f..eaf80e11aec 100644
--- a/internal/generated/snippets/automl/apiv1/Client/UndeployModel/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/UndeployModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.UndeployModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#UndeployModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#UndeployModelRequest.
 	}
 	op, err := c.UndeployModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/UpdateDataset/main.go b/internal/generated/snippets/automl/apiv1/Client/UpdateDataset/main.go
index 83093368d63..811343c8c7a 100644
--- a/internal/generated/snippets/automl/apiv1/Client/UpdateDataset/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/UpdateDataset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.UpdateDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#UpdateDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#UpdateDatasetRequest.
 	}
 	resp, err := c.UpdateDataset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/Client/UpdateModel/main.go b/internal/generated/snippets/automl/apiv1/Client/UpdateModel/main.go
index 0b4dc172506..85d1e045304 100644
--- a/internal/generated/snippets/automl/apiv1/Client/UpdateModel/main.go
+++ b/internal/generated/snippets/automl/apiv1/Client/UpdateModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &automlpb.UpdateModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#UpdateModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#UpdateModelRequest.
 	}
 	resp, err := c.UpdateModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/PredictionClient/BatchPredict/main.go b/internal/generated/snippets/automl/apiv1/PredictionClient/BatchPredict/main.go
index b40a49dd2cc..dfcffb6bdd0 100644
--- a/internal/generated/snippets/automl/apiv1/PredictionClient/BatchPredict/main.go
+++ b/internal/generated/snippets/automl/apiv1/PredictionClient/BatchPredict/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &automlpb.BatchPredictRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#BatchPredictRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#BatchPredictRequest.
 	}
 	op, err := c.BatchPredict(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/PredictionClient/Predict/main.go b/internal/generated/snippets/automl/apiv1/PredictionClient/Predict/main.go
index 998570f7a85..50ad14eaf7c 100644
--- a/internal/generated/snippets/automl/apiv1/PredictionClient/Predict/main.go
+++ b/internal/generated/snippets/automl/apiv1/PredictionClient/Predict/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	automl "cloud.google.com/go/automl/apiv1"
-	automlpb "google.golang.org/genproto/googleapis/cloud/automl/v1"
+	automlpb "cloud.google.com/go/automl/apiv1/automlpb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &automlpb.PredictRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/automl/v1#PredictRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/automl/apiv1/automlpb#PredictRequest.
 	}
 	resp, err := c.Predict(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/automl/apiv1/snippet_metadata.google.cloud.automl.v1.json b/internal/generated/snippets/automl/apiv1/snippet_metadata.google.cloud.automl.v1.json
index c5e337b3e31..a88aa4475dd 100644
--- a/internal/generated/snippets/automl/apiv1/snippet_metadata.google.cloud.automl.v1.json
+++ b/internal/generated/snippets/automl/apiv1/snippet_metadata.google.cloud.automl.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/automl/apiv1",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -742,7 +742,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -788,7 +788,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -834,7 +834,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/automl/apiv1beta1/snippet_metadata.google.cloud.automl.v1beta1.json b/internal/generated/snippets/automl/apiv1beta1/snippet_metadata.google.cloud.automl.v1beta1.json
index ce8f32d8e18..98dd5325643 100644
--- a/internal/generated/snippets/automl/apiv1beta1/snippet_metadata.google.cloud.automl.v1beta1.json
+++ b/internal/generated/snippets/automl/apiv1beta1/snippet_metadata.google.cloud.automl.v1beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/automl/apiv1beta1",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/DetachLun/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/DetachLun/main.go
index 7d37f438ee7..74363a0dbe9 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/DetachLun/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/DetachLun/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.DetachLunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#DetachLunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#DetachLunRequest.
 	}
 	op, err := c.DetachLun(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetInstance/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetInstance/main.go
index 217a713e354..f49d9b2549c 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetInstance/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetLun/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetLun/main.go
index 7205cd74b31..f3d8eef642d 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetLun/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetLun/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.GetLunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetLunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetLunRequest.
 	}
 	resp, err := c.GetLun(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetNetwork/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetNetwork/main.go
index e38e1430576..07d6464f5f5 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetNetwork/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetNetwork/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.GetNetworkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetNetworkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetNetworkRequest.
 	}
 	resp, err := c.GetNetwork(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetNfsShare/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetNfsShare/main.go
index 5f375f0e57e..d85915fe134 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetNfsShare/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetNfsShare/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.GetNfsShareRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetNfsShareRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetNfsShareRequest.
 	}
 	resp, err := c.GetNfsShare(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetVolume/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetVolume/main.go
index 72a1282ff09..94561497bb4 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/GetVolume/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/GetVolume/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.GetVolumeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#GetVolumeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#GetVolumeRequest.
 	}
 	resp, err := c.GetVolume(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListInstances/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListInstances/main.go
index a1a0a89a9d0..38cf50dee35 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListInstances/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListInstances/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 	"google.golang.org/api/iterator"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &baremetalsolutionpb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListLuns/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListLuns/main.go
index 1b064f4a58e..3b9e9c9f496 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListLuns/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListLuns/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 	"google.golang.org/api/iterator"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &baremetalsolutionpb.ListLunsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListLunsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListLunsRequest.
 	}
 	it := c.ListLuns(ctx, req)
 	for {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNetworkUsage/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNetworkUsage/main.go
index 4792c12cb35..97bb6f41b29 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNetworkUsage/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNetworkUsage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.ListNetworkUsageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListNetworkUsageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListNetworkUsageRequest.
 	}
 	resp, err := c.ListNetworkUsage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNetworks/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNetworks/main.go
index b2714bd618e..60083829230 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNetworks/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNetworks/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 	"google.golang.org/api/iterator"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &baremetalsolutionpb.ListNetworksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListNetworksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListNetworksRequest.
 	}
 	it := c.ListNetworks(ctx, req)
 	for {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNfsShares/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNfsShares/main.go
index e0ebdc35306..6813803fca4 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNfsShares/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListNfsShares/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 	"google.golang.org/api/iterator"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &baremetalsolutionpb.ListNfsSharesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListNfsSharesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListNfsSharesRequest.
 	}
 	it := c.ListNfsShares(ctx, req)
 	for {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListVolumes/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListVolumes/main.go
index 42c124b60a7..73f517af8be 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/ListVolumes/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/ListVolumes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 	"google.golang.org/api/iterator"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &baremetalsolutionpb.ListVolumesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ListVolumesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ListVolumesRequest.
 	}
 	it := c.ListVolumes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/ResetInstance/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/ResetInstance/main.go
index fc01177ccbc..227193b64ed 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/ResetInstance/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/ResetInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.ResetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ResetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ResetInstanceRequest.
 	}
 	op, err := c.ResetInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/ResizeVolume/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/ResizeVolume/main.go
index 5a627e2bb42..742170aad7c 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/ResizeVolume/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/ResizeVolume/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.ResizeVolumeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#ResizeVolumeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#ResizeVolumeRequest.
 	}
 	op, err := c.ResizeVolume(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/StartInstance/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/StartInstance/main.go
index f6420992922..a650113e03a 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/StartInstance/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/StartInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.StartInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#StartInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#StartInstanceRequest.
 	}
 	op, err := c.StartInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/StopInstance/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/StopInstance/main.go
index ae7fd1a2d64..b74e4da2045 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/StopInstance/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/StopInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.StopInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#StopInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#StopInstanceRequest.
 	}
 	op, err := c.StopInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateInstance/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateInstance/main.go
index b64bbd3e577..3c263ab360a 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateInstance/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.UpdateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#UpdateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#UpdateInstanceRequest.
 	}
 	op, err := c.UpdateInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateNetwork/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateNetwork/main.go
index 01f39025563..6043d429717 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateNetwork/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateNetwork/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.UpdateNetworkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#UpdateNetworkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#UpdateNetworkRequest.
 	}
 	op, err := c.UpdateNetwork(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateNfsShare/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateNfsShare/main.go
index 73e8faee587..437e95af118 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateNfsShare/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateNfsShare/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.UpdateNfsShareRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#UpdateNfsShareRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#UpdateNfsShareRequest.
 	}
 	op, err := c.UpdateNfsShare(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateVolume/main.go b/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateVolume/main.go
index 017747eb834..439fc1f8587 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateVolume/main.go
+++ b/internal/generated/snippets/baremetalsolution/apiv2/Client/UpdateVolume/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	baremetalsolution "cloud.google.com/go/baremetalsolution/apiv2"
-
-	baremetalsolutionpb "google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2"
+	baremetalsolutionpb "cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &baremetalsolutionpb.UpdateVolumeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/baremetalsolution/v2#UpdateVolumeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/baremetalsolution/apiv2/baremetalsolutionpb#UpdateVolumeRequest.
 	}
 	op, err := c.UpdateVolume(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/baremetalsolution/apiv2/snippet_metadata.google.cloud.baremetalsolution.v2.json b/internal/generated/snippets/baremetalsolution/apiv2/snippet_metadata.google.cloud.baremetalsolution.v2.json
index 40b4da71bac..7607f2dc314 100644
--- a/internal/generated/snippets/baremetalsolution/apiv2/snippet_metadata.google.cloud.baremetalsolution.v2.json
+++ b/internal/generated/snippets/baremetalsolution/apiv2/snippet_metadata.google.cloud.baremetalsolution.v2.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/baremetalsolution/apiv2",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -742,7 +742,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -788,7 +788,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -834,7 +834,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -880,7 +880,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -926,7 +926,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -972,7 +972,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1018,7 +1018,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/batch/apiv1/Client/CreateJob/main.go b/internal/generated/snippets/batch/apiv1/Client/CreateJob/main.go
index 23f62b414ee..4ce1cdb40cb 100644
--- a/internal/generated/snippets/batch/apiv1/Client/CreateJob/main.go
+++ b/internal/generated/snippets/batch/apiv1/Client/CreateJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	batch "cloud.google.com/go/batch/apiv1"
-
-	batchpb "google.golang.org/genproto/googleapis/cloud/batch/v1"
+	batchpb "cloud.google.com/go/batch/apiv1/batchpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &batchpb.CreateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#CreateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#CreateJobRequest.
 	}
 	resp, err := c.CreateJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/batch/apiv1/Client/DeleteJob/main.go b/internal/generated/snippets/batch/apiv1/Client/DeleteJob/main.go
index 721e65e1dfd..40850049465 100644
--- a/internal/generated/snippets/batch/apiv1/Client/DeleteJob/main.go
+++ b/internal/generated/snippets/batch/apiv1/Client/DeleteJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	batch "cloud.google.com/go/batch/apiv1"
-
-	batchpb "google.golang.org/genproto/googleapis/cloud/batch/v1"
+	batchpb "cloud.google.com/go/batch/apiv1/batchpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &batchpb.DeleteJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#DeleteJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#DeleteJobRequest.
 	}
 	op, err := c.DeleteJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/batch/apiv1/Client/GetJob/main.go b/internal/generated/snippets/batch/apiv1/Client/GetJob/main.go
index 0beb68f4d62..05119232e90 100644
--- a/internal/generated/snippets/batch/apiv1/Client/GetJob/main.go
+++ b/internal/generated/snippets/batch/apiv1/Client/GetJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	batch "cloud.google.com/go/batch/apiv1"
-
-	batchpb "google.golang.org/genproto/googleapis/cloud/batch/v1"
+	batchpb "cloud.google.com/go/batch/apiv1/batchpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &batchpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/batch/apiv1/Client/GetTask/main.go b/internal/generated/snippets/batch/apiv1/Client/GetTask/main.go
index 2a6939cf41f..2d5bc3a7c5a 100644
--- a/internal/generated/snippets/batch/apiv1/Client/GetTask/main.go
+++ b/internal/generated/snippets/batch/apiv1/Client/GetTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	batch "cloud.google.com/go/batch/apiv1"
-
-	batchpb "google.golang.org/genproto/googleapis/cloud/batch/v1"
+	batchpb "cloud.google.com/go/batch/apiv1/batchpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &batchpb.GetTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#GetTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#GetTaskRequest.
 	}
 	resp, err := c.GetTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/batch/apiv1/Client/ListJobs/main.go b/internal/generated/snippets/batch/apiv1/Client/ListJobs/main.go
index b9dc67c4449..5f3bff23966 100644
--- a/internal/generated/snippets/batch/apiv1/Client/ListJobs/main.go
+++ b/internal/generated/snippets/batch/apiv1/Client/ListJobs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	batch "cloud.google.com/go/batch/apiv1"
+	batchpb "cloud.google.com/go/batch/apiv1/batchpb"
 	"google.golang.org/api/iterator"
-
-	batchpb "google.golang.org/genproto/googleapis/cloud/batch/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &batchpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/batch/apiv1/Client/ListTasks/main.go b/internal/generated/snippets/batch/apiv1/Client/ListTasks/main.go
index c87a4e61b86..61ba68af824 100644
--- a/internal/generated/snippets/batch/apiv1/Client/ListTasks/main.go
+++ b/internal/generated/snippets/batch/apiv1/Client/ListTasks/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	batch "cloud.google.com/go/batch/apiv1"
+	batchpb "cloud.google.com/go/batch/apiv1/batchpb"
 	"google.golang.org/api/iterator"
-
-	batchpb "google.golang.org/genproto/googleapis/cloud/batch/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &batchpb.ListTasksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/batch/v1#ListTasksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/batch/apiv1/batchpb#ListTasksRequest.
 	}
 	it := c.ListTasks(ctx, req)
 	for {
diff --git a/internal/generated/snippets/batch/apiv1/snippet_metadata.google.cloud.batch.v1.json b/internal/generated/snippets/batch/apiv1/snippet_metadata.google.cloud.batch.v1.json
index 5132c3ed5a4..00c125615d7 100644
--- a/internal/generated/snippets/batch/apiv1/snippet_metadata.google.cloud.batch.v1.json
+++ b/internal/generated/snippets/batch/apiv1/snippet_metadata.google.cloud.batch.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/batch/apiv1",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -280,7 +280,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -464,7 +464,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/CreateAppConnection/main.go b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/CreateAppConnection/main.go
index 5a17bc48bb8..4a20dfef239 100644
--- a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/CreateAppConnection/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/CreateAppConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnections "cloud.google.com/go/beyondcorp/appconnections/apiv1"
-
-	appconnectionspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1"
+	appconnectionspb "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectionspb.CreateAppConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#CreateAppConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#CreateAppConnectionRequest.
 	}
 	op, err := c.CreateAppConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/DeleteAppConnection/main.go b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/DeleteAppConnection/main.go
index 63b7b472391..a4b32262c7a 100644
--- a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/DeleteAppConnection/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/DeleteAppConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnections "cloud.google.com/go/beyondcorp/appconnections/apiv1"
-
-	appconnectionspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1"
+	appconnectionspb "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectionspb.DeleteAppConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#DeleteAppConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#DeleteAppConnectionRequest.
 	}
 	op, err := c.DeleteAppConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/GetAppConnection/main.go b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/GetAppConnection/main.go
index 9ac7227f503..110d6472cf6 100644
--- a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/GetAppConnection/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/GetAppConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnections "cloud.google.com/go/beyondcorp/appconnections/apiv1"
-
-	appconnectionspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1"
+	appconnectionspb "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectionspb.GetAppConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#GetAppConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#GetAppConnectionRequest.
 	}
 	resp, err := c.GetAppConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/ListAppConnections/main.go b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/ListAppConnections/main.go
index 15770b4c851..44110d34052 100644
--- a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/ListAppConnections/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/ListAppConnections/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appconnections "cloud.google.com/go/beyondcorp/appconnections/apiv1"
+	appconnectionspb "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb"
 	"google.golang.org/api/iterator"
-
-	appconnectionspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appconnectionspb.ListAppConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#ListAppConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#ListAppConnectionsRequest.
 	}
 	it := c.ListAppConnections(ctx, req)
 	for {
diff --git a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/ResolveAppConnections/main.go b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/ResolveAppConnections/main.go
index 8e6c2c073e5..a10320e2905 100644
--- a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/ResolveAppConnections/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/ResolveAppConnections/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appconnections "cloud.google.com/go/beyondcorp/appconnections/apiv1"
+	appconnectionspb "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb"
 	"google.golang.org/api/iterator"
-
-	appconnectionspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appconnectionspb.ResolveAppConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#ResolveAppConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#ResolveAppConnectionsRequest.
 	}
 	it := c.ResolveAppConnections(ctx, req)
 	for {
diff --git a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/UpdateAppConnection/main.go b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/UpdateAppConnection/main.go
index caa9563830e..973c6413f93 100644
--- a/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/UpdateAppConnection/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnections/apiv1/Client/UpdateAppConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnections "cloud.google.com/go/beyondcorp/appconnections/apiv1"
-
-	appconnectionspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1"
+	appconnectionspb "cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectionspb.UpdateAppConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnections/v1#UpdateAppConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnections/apiv1/appconnectionspb#UpdateAppConnectionRequest.
 	}
 	op, err := c.UpdateAppConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnections/apiv1/snippet_metadata.google.cloud.beyondcorp.appconnections.v1.json b/internal/generated/snippets/beyondcorp/appconnections/apiv1/snippet_metadata.google.cloud.beyondcorp.appconnections.v1.json
index 478810e9b0f..6165c4fd403 100644
--- a/internal/generated/snippets/beyondcorp/appconnections/apiv1/snippet_metadata.google.cloud.beyondcorp.appconnections.v1.json
+++ b/internal/generated/snippets/beyondcorp/appconnections/apiv1/snippet_metadata.google.cloud.beyondcorp.appconnections.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/beyondcorp/appconnections/apiv1",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -234,7 +234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -694,7 +694,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/CreateAppConnector/main.go b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/CreateAppConnector/main.go
index 230ab5ddcac..923c3e681e9 100644
--- a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/CreateAppConnector/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/CreateAppConnector/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnectors "cloud.google.com/go/beyondcorp/appconnectors/apiv1"
-
-	appconnectorspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1"
+	appconnectorspb "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectorspb.CreateAppConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#CreateAppConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#CreateAppConnectorRequest.
 	}
 	op, err := c.CreateAppConnector(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/DeleteAppConnector/main.go b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/DeleteAppConnector/main.go
index eb5806d44f7..4a00a692c52 100644
--- a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/DeleteAppConnector/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/DeleteAppConnector/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnectors "cloud.google.com/go/beyondcorp/appconnectors/apiv1"
-
-	appconnectorspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1"
+	appconnectorspb "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectorspb.DeleteAppConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#DeleteAppConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#DeleteAppConnectorRequest.
 	}
 	op, err := c.DeleteAppConnector(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/GetAppConnector/main.go b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/GetAppConnector/main.go
index 1ce075d113a..66c1482b875 100644
--- a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/GetAppConnector/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/GetAppConnector/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnectors "cloud.google.com/go/beyondcorp/appconnectors/apiv1"
-
-	appconnectorspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1"
+	appconnectorspb "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectorspb.GetAppConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#GetAppConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#GetAppConnectorRequest.
 	}
 	resp, err := c.GetAppConnector(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/ListAppConnectors/main.go b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/ListAppConnectors/main.go
index 1f9a424a861..fb895e89d28 100644
--- a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/ListAppConnectors/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/ListAppConnectors/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appconnectors "cloud.google.com/go/beyondcorp/appconnectors/apiv1"
+	appconnectorspb "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb"
 	"google.golang.org/api/iterator"
-
-	appconnectorspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appconnectorspb.ListAppConnectorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#ListAppConnectorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#ListAppConnectorsRequest.
 	}
 	it := c.ListAppConnectors(ctx, req)
 	for {
diff --git a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/ReportStatus/main.go b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/ReportStatus/main.go
index fde15bf12a8..664f09e8470 100644
--- a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/ReportStatus/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/ReportStatus/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnectors "cloud.google.com/go/beyondcorp/appconnectors/apiv1"
-
-	appconnectorspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1"
+	appconnectorspb "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectorspb.ReportStatusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#ReportStatusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#ReportStatusRequest.
 	}
 	op, err := c.ReportStatus(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/UpdateAppConnector/main.go b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/UpdateAppConnector/main.go
index c84433de7f3..3de7a712ed9 100644
--- a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/UpdateAppConnector/main.go
+++ b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/Client/UpdateAppConnector/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appconnectors "cloud.google.com/go/beyondcorp/appconnectors/apiv1"
-
-	appconnectorspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1"
+	appconnectorspb "cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appconnectorspb.UpdateAppConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appconnectors/v1#UpdateAppConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appconnectors/apiv1/appconnectorspb#UpdateAppConnectorRequest.
 	}
 	op, err := c.UpdateAppConnector(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/snippet_metadata.google.cloud.beyondcorp.appconnectors.v1.json b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/snippet_metadata.google.cloud.beyondcorp.appconnectors.v1.json
index db023e986ca..6a805a2aa35 100644
--- a/internal/generated/snippets/beyondcorp/appconnectors/apiv1/snippet_metadata.google.cloud.beyondcorp.appconnectors.v1.json
+++ b/internal/generated/snippets/beyondcorp/appconnectors/apiv1/snippet_metadata.google.cloud.beyondcorp.appconnectors.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/beyondcorp/appconnectors/apiv1",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -234,7 +234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -694,7 +694,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/CreateAppGateway/main.go b/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/CreateAppGateway/main.go
index 08651696cdd..1d249e00b7f 100644
--- a/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/CreateAppGateway/main.go
+++ b/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/CreateAppGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appgateways "cloud.google.com/go/beyondcorp/appgateways/apiv1"
-
-	appgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1"
+	appgatewayspb "cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appgatewayspb.CreateAppGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#CreateAppGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#CreateAppGatewayRequest.
 	}
 	op, err := c.CreateAppGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/DeleteAppGateway/main.go b/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/DeleteAppGateway/main.go
index c8a12ce0908..967e3164550 100644
--- a/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/DeleteAppGateway/main.go
+++ b/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/DeleteAppGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appgateways "cloud.google.com/go/beyondcorp/appgateways/apiv1"
-
-	appgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1"
+	appgatewayspb "cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appgatewayspb.DeleteAppGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#DeleteAppGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#DeleteAppGatewayRequest.
 	}
 	op, err := c.DeleteAppGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/GetAppGateway/main.go b/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/GetAppGateway/main.go
index f211469eb57..ae72ee04e9f 100644
--- a/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/GetAppGateway/main.go
+++ b/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/GetAppGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	appgateways "cloud.google.com/go/beyondcorp/appgateways/apiv1"
-
-	appgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1"
+	appgatewayspb "cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &appgatewayspb.GetAppGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#GetAppGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#GetAppGatewayRequest.
 	}
 	resp, err := c.GetAppGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/ListAppGateways/main.go b/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/ListAppGateways/main.go
index ca5345db2d6..7c17fe37962 100644
--- a/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/ListAppGateways/main.go
+++ b/internal/generated/snippets/beyondcorp/appgateways/apiv1/Client/ListAppGateways/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	appgateways "cloud.google.com/go/beyondcorp/appgateways/apiv1"
+	appgatewayspb "cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb"
 	"google.golang.org/api/iterator"
-
-	appgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &appgatewayspb.ListAppGatewaysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/appgateways/v1#ListAppGatewaysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/appgateways/apiv1/appgatewayspb#ListAppGatewaysRequest.
 	}
 	it := c.ListAppGateways(ctx, req)
 	for {
diff --git a/internal/generated/snippets/beyondcorp/appgateways/apiv1/snippet_metadata.google.cloud.beyondcorp.appgateways.v1.json b/internal/generated/snippets/beyondcorp/appgateways/apiv1/snippet_metadata.google.cloud.beyondcorp.appgateways.v1.json
index d7e7c7e7794..615d4ea38b9 100644
--- a/internal/generated/snippets/beyondcorp/appgateways/apiv1/snippet_metadata.google.cloud.beyondcorp.appgateways.v1.json
+++ b/internal/generated/snippets/beyondcorp/appgateways/apiv1/snippet_metadata.google.cloud.beyondcorp.appgateways.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/beyondcorp/appgateways/apiv1",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -234,7 +234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/CreateClientConnectorService/main.go b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/CreateClientConnectorService/main.go
index 7dedf9cecd3..f09ae47aa85 100644
--- a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/CreateClientConnectorService/main.go
+++ b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/CreateClientConnectorService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clientconnectorservices "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1"
-
-	clientconnectorservicespb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1"
+	clientconnectorservicespb "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clientconnectorservicespb.CreateClientConnectorServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#CreateClientConnectorServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#CreateClientConnectorServiceRequest.
 	}
 	op, err := c.CreateClientConnectorService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/DeleteClientConnectorService/main.go b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/DeleteClientConnectorService/main.go
index 54a06c5b279..48fc5972439 100644
--- a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/DeleteClientConnectorService/main.go
+++ b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/DeleteClientConnectorService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clientconnectorservices "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1"
-
-	clientconnectorservicespb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1"
+	clientconnectorservicespb "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clientconnectorservicespb.DeleteClientConnectorServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#DeleteClientConnectorServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#DeleteClientConnectorServiceRequest.
 	}
 	op, err := c.DeleteClientConnectorService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/GetClientConnectorService/main.go b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/GetClientConnectorService/main.go
index 582b9d5b80b..76a5beb256a 100644
--- a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/GetClientConnectorService/main.go
+++ b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/GetClientConnectorService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clientconnectorservices "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1"
-
-	clientconnectorservicespb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1"
+	clientconnectorservicespb "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clientconnectorservicespb.GetClientConnectorServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#GetClientConnectorServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#GetClientConnectorServiceRequest.
 	}
 	resp, err := c.GetClientConnectorService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/ListClientConnectorServices/main.go b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/ListClientConnectorServices/main.go
index 526cc488ebd..b6b80f56ab0 100644
--- a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/ListClientConnectorServices/main.go
+++ b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/ListClientConnectorServices/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	clientconnectorservices "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1"
+	clientconnectorservicespb "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb"
 	"google.golang.org/api/iterator"
-
-	clientconnectorservicespb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &clientconnectorservicespb.ListClientConnectorServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#ListClientConnectorServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#ListClientConnectorServicesRequest.
 	}
 	it := c.ListClientConnectorServices(ctx, req)
 	for {
diff --git a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/UpdateClientConnectorService/main.go b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/UpdateClientConnectorService/main.go
index 5ca9c7d29ce..c0f0378ec49 100644
--- a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/UpdateClientConnectorService/main.go
+++ b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/Client/UpdateClientConnectorService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clientconnectorservices "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1"
-
-	clientconnectorservicespb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1"
+	clientconnectorservicespb "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clientconnectorservicespb.UpdateClientConnectorServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientconnectorservices/v1#UpdateClientConnectorServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1/clientconnectorservicespb#UpdateClientConnectorServiceRequest.
 	}
 	op, err := c.UpdateClientConnectorService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/snippet_metadata.google.cloud.beyondcorp.clientconnectorservices.v1.json b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/snippet_metadata.google.cloud.beyondcorp.clientconnectorservices.v1.json
index cfdb0b35b1b..3cdf6c13fe1 100644
--- a/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/snippet_metadata.google.cloud.beyondcorp.clientconnectorservices.v1.json
+++ b/internal/generated/snippets/beyondcorp/clientconnectorservices/apiv1/snippet_metadata.google.cloud.beyondcorp.clientconnectorservices.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/beyondcorp/clientconnectorservices/apiv1",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -234,7 +234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -648,7 +648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/CreateClientGateway/main.go b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/CreateClientGateway/main.go
index 98290cdfa1e..518512d65ae 100644
--- a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/CreateClientGateway/main.go
+++ b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/CreateClientGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clientgateways "cloud.google.com/go/beyondcorp/clientgateways/apiv1"
-
-	clientgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1"
+	clientgatewayspb "cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clientgatewayspb.CreateClientGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#CreateClientGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#CreateClientGatewayRequest.
 	}
 	op, err := c.CreateClientGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/DeleteClientGateway/main.go b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/DeleteClientGateway/main.go
index 0083168edfc..4ef41555905 100644
--- a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/DeleteClientGateway/main.go
+++ b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/DeleteClientGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clientgateways "cloud.google.com/go/beyondcorp/clientgateways/apiv1"
-
-	clientgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1"
+	clientgatewayspb "cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clientgatewayspb.DeleteClientGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#DeleteClientGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#DeleteClientGatewayRequest.
 	}
 	op, err := c.DeleteClientGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/GetClientGateway/main.go b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/GetClientGateway/main.go
index 248dc535d81..0416483d665 100644
--- a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/GetClientGateway/main.go
+++ b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/GetClientGateway/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clientgateways "cloud.google.com/go/beyondcorp/clientgateways/apiv1"
-
-	clientgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1"
+	clientgatewayspb "cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clientgatewayspb.GetClientGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#GetClientGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#GetClientGatewayRequest.
 	}
 	resp, err := c.GetClientGateway(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/ListClientGateways/main.go b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/ListClientGateways/main.go
index cc4092309d3..6071ab7ea47 100644
--- a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/ListClientGateways/main.go
+++ b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/Client/ListClientGateways/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	clientgateways "cloud.google.com/go/beyondcorp/clientgateways/apiv1"
+	clientgatewayspb "cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb"
 	"google.golang.org/api/iterator"
-
-	clientgatewayspb "google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &clientgatewayspb.ListClientGatewaysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/beyondcorp/clientgateways/v1#ListClientGatewaysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/beyondcorp/clientgateways/apiv1/clientgatewayspb#ListClientGatewaysRequest.
 	}
 	it := c.ListClientGateways(ctx, req)
 	for {
diff --git a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/snippet_metadata.google.cloud.beyondcorp.clientgateways.v1.json b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/snippet_metadata.google.cloud.beyondcorp.clientgateways.v1.json
index 2af32894a85..534aa189918 100644
--- a/internal/generated/snippets/beyondcorp/clientgateways/apiv1/snippet_metadata.google.cloud.beyondcorp.clientgateways.v1.json
+++ b/internal/generated/snippets/beyondcorp/clientgateways/apiv1/snippet_metadata.google.cloud.beyondcorp.clientgateways.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/beyondcorp/clientgateways/apiv1",
-    "version": "0.1.1",
+    "version": "0.2.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -234,7 +234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/billing/apiv1/CloudBillingClient/CreateBillingAccount/main.go b/internal/generated/snippets/billing/apiv1/CloudBillingClient/CreateBillingAccount/main.go
index 035df228e11..a4487b210fa 100644
--- a/internal/generated/snippets/billing/apiv1/CloudBillingClient/CreateBillingAccount/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudBillingClient/CreateBillingAccount/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &billingpb.CreateBillingAccountRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#CreateBillingAccountRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#CreateBillingAccountRequest.
 	}
 	resp, err := c.CreateBillingAccount(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/apiv1/CloudBillingClient/GetBillingAccount/main.go b/internal/generated/snippets/billing/apiv1/CloudBillingClient/GetBillingAccount/main.go
index d19f3d76d00..6f33d9d0a7b 100644
--- a/internal/generated/snippets/billing/apiv1/CloudBillingClient/GetBillingAccount/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudBillingClient/GetBillingAccount/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &billingpb.GetBillingAccountRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#GetBillingAccountRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#GetBillingAccountRequest.
 	}
 	resp, err := c.GetBillingAccount(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/apiv1/CloudBillingClient/GetProjectBillingInfo/main.go b/internal/generated/snippets/billing/apiv1/CloudBillingClient/GetProjectBillingInfo/main.go
index 726439261e7..5fb4e4339b8 100644
--- a/internal/generated/snippets/billing/apiv1/CloudBillingClient/GetProjectBillingInfo/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudBillingClient/GetProjectBillingInfo/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &billingpb.GetProjectBillingInfoRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#GetProjectBillingInfoRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#GetProjectBillingInfoRequest.
 	}
 	resp, err := c.GetProjectBillingInfo(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/apiv1/CloudBillingClient/ListBillingAccounts/main.go b/internal/generated/snippets/billing/apiv1/CloudBillingClient/ListBillingAccounts/main.go
index 58c1bb7e816..9319eb0368e 100644
--- a/internal/generated/snippets/billing/apiv1/CloudBillingClient/ListBillingAccounts/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudBillingClient/ListBillingAccounts/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 	"google.golang.org/api/iterator"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &billingpb.ListBillingAccountsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#ListBillingAccountsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#ListBillingAccountsRequest.
 	}
 	it := c.ListBillingAccounts(ctx, req)
 	for {
diff --git a/internal/generated/snippets/billing/apiv1/CloudBillingClient/ListProjectBillingInfo/main.go b/internal/generated/snippets/billing/apiv1/CloudBillingClient/ListProjectBillingInfo/main.go
index 75540361588..4744617ae5a 100644
--- a/internal/generated/snippets/billing/apiv1/CloudBillingClient/ListProjectBillingInfo/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudBillingClient/ListProjectBillingInfo/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 	"google.golang.org/api/iterator"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &billingpb.ListProjectBillingInfoRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#ListProjectBillingInfoRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#ListProjectBillingInfoRequest.
 	}
 	it := c.ListProjectBillingInfo(ctx, req)
 	for {
diff --git a/internal/generated/snippets/billing/apiv1/CloudBillingClient/UpdateBillingAccount/main.go b/internal/generated/snippets/billing/apiv1/CloudBillingClient/UpdateBillingAccount/main.go
index 2f648afbb61..5ab93ec4b5e 100644
--- a/internal/generated/snippets/billing/apiv1/CloudBillingClient/UpdateBillingAccount/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudBillingClient/UpdateBillingAccount/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &billingpb.UpdateBillingAccountRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#UpdateBillingAccountRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#UpdateBillingAccountRequest.
 	}
 	resp, err := c.UpdateBillingAccount(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/apiv1/CloudBillingClient/UpdateProjectBillingInfo/main.go b/internal/generated/snippets/billing/apiv1/CloudBillingClient/UpdateProjectBillingInfo/main.go
index 0f688d79cbf..3fbe53f9bdb 100644
--- a/internal/generated/snippets/billing/apiv1/CloudBillingClient/UpdateProjectBillingInfo/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudBillingClient/UpdateProjectBillingInfo/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &billingpb.UpdateProjectBillingInfoRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#UpdateProjectBillingInfoRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#UpdateProjectBillingInfoRequest.
 	}
 	resp, err := c.UpdateProjectBillingInfo(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/apiv1/CloudCatalogClient/ListServices/main.go b/internal/generated/snippets/billing/apiv1/CloudCatalogClient/ListServices/main.go
index 99334cc760b..14411433465 100644
--- a/internal/generated/snippets/billing/apiv1/CloudCatalogClient/ListServices/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudCatalogClient/ListServices/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 	"google.golang.org/api/iterator"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &billingpb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
diff --git a/internal/generated/snippets/billing/apiv1/CloudCatalogClient/ListSkus/main.go b/internal/generated/snippets/billing/apiv1/CloudCatalogClient/ListSkus/main.go
index 934ca9284e9..ab450c6fad2 100644
--- a/internal/generated/snippets/billing/apiv1/CloudCatalogClient/ListSkus/main.go
+++ b/internal/generated/snippets/billing/apiv1/CloudCatalogClient/ListSkus/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	billing "cloud.google.com/go/billing/apiv1"
+	billingpb "cloud.google.com/go/billing/apiv1/billingpb"
 	"google.golang.org/api/iterator"
-
-	billingpb "google.golang.org/genproto/googleapis/cloud/billing/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &billingpb.ListSkusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/v1#ListSkusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/apiv1/billingpb#ListSkusRequest.
 	}
 	it := c.ListSkus(ctx, req)
 	for {
diff --git a/internal/generated/snippets/billing/apiv1/snippet_metadata.google.cloud.billing.v1.json b/internal/generated/snippets/billing/apiv1/snippet_metadata.google.cloud.billing.v1.json
index 5dc928e64dc..3712d2c8e9b 100644
--- a/internal/generated/snippets/billing/apiv1/snippet_metadata.google.cloud.billing.v1.json
+++ b/internal/generated/snippets/billing/apiv1/snippet_metadata.google.cloud.billing.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/billing/apiv1",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/CreateBudget/main.go b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/CreateBudget/main.go
index 3b6b21346b2..871d730ec8b 100644
--- a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/CreateBudget/main.go
+++ b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/CreateBudget/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	budgets "cloud.google.com/go/billing/budgets/apiv1"
-
-	budgetspb "google.golang.org/genproto/googleapis/cloud/billing/budgets/v1"
+	budgetspb "cloud.google.com/go/billing/budgets/apiv1/budgetspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &budgetspb.CreateBudgetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#CreateBudgetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#CreateBudgetRequest.
 	}
 	resp, err := c.CreateBudget(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/DeleteBudget/main.go b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/DeleteBudget/main.go
index 44e0ccf91ff..05fa18a9416 100644
--- a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/DeleteBudget/main.go
+++ b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/DeleteBudget/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	budgets "cloud.google.com/go/billing/budgets/apiv1"
-
-	budgetspb "google.golang.org/genproto/googleapis/cloud/billing/budgets/v1"
+	budgetspb "cloud.google.com/go/billing/budgets/apiv1/budgetspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &budgetspb.DeleteBudgetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#DeleteBudgetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#DeleteBudgetRequest.
 	}
 	err = c.DeleteBudget(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/GetBudget/main.go b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/GetBudget/main.go
index 870b876e0e5..8b2377ba7e4 100644
--- a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/GetBudget/main.go
+++ b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/GetBudget/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	budgets "cloud.google.com/go/billing/budgets/apiv1"
-
-	budgetspb "google.golang.org/genproto/googleapis/cloud/billing/budgets/v1"
+	budgetspb "cloud.google.com/go/billing/budgets/apiv1/budgetspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &budgetspb.GetBudgetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#GetBudgetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#GetBudgetRequest.
 	}
 	resp, err := c.GetBudget(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/ListBudgets/main.go b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/ListBudgets/main.go
index f6bc2139b89..c53578ae362 100644
--- a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/ListBudgets/main.go
+++ b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/ListBudgets/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	budgets "cloud.google.com/go/billing/budgets/apiv1"
+	budgetspb "cloud.google.com/go/billing/budgets/apiv1/budgetspb"
 	"google.golang.org/api/iterator"
-
-	budgetspb "google.golang.org/genproto/googleapis/cloud/billing/budgets/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &budgetspb.ListBudgetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#ListBudgetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#ListBudgetsRequest.
 	}
 	it := c.ListBudgets(ctx, req)
 	for {
diff --git a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/UpdateBudget/main.go b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/UpdateBudget/main.go
index 481f8a014e6..fbbc630fa0b 100644
--- a/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/UpdateBudget/main.go
+++ b/internal/generated/snippets/billing/budgets/apiv1/BudgetClient/UpdateBudget/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	budgets "cloud.google.com/go/billing/budgets/apiv1"
-
-	budgetspb "google.golang.org/genproto/googleapis/cloud/billing/budgets/v1"
+	budgetspb "cloud.google.com/go/billing/budgets/apiv1/budgetspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &budgetspb.UpdateBudgetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/billing/budgets/v1#UpdateBudgetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/billing/budgets/apiv1/budgetspb#UpdateBudgetRequest.
 	}
 	resp, err := c.UpdateBudget(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/billing/budgets/apiv1/snippet_metadata.google.cloud.billing.budgets.v1.json b/internal/generated/snippets/billing/budgets/apiv1/snippet_metadata.google.cloud.billing.budgets.v1.json
index bf46c8ab912..d33054dd6bb 100644
--- a/internal/generated/snippets/billing/budgets/apiv1/snippet_metadata.google.cloud.billing.budgets.v1.json
+++ b/internal/generated/snippets/billing/budgets/apiv1/snippet_metadata.google.cloud.billing.budgets.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/billing/budgets/apiv1",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/billing/budgets/apiv1beta1/snippet_metadata.google.cloud.billing.budgets.v1beta1.json b/internal/generated/snippets/billing/budgets/apiv1beta1/snippet_metadata.google.cloud.billing.budgets.v1beta1.json
index da1a6a2757a..5c065bbc196 100644
--- a/internal/generated/snippets/billing/budgets/apiv1beta1/snippet_metadata.google.cloud.billing.budgets.v1beta1.json
+++ b/internal/generated/snippets/billing/budgets/apiv1beta1/snippet_metadata.google.cloud.billing.budgets.v1beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/billing/budgets/apiv1beta1",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/CreateAttestor/main.go b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/CreateAttestor/main.go
index 6b25eb1f2a2..a32ef1472ca 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/CreateAttestor/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/CreateAttestor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &binaryauthorizationpb.CreateAttestorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#CreateAttestorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#CreateAttestorRequest.
 	}
 	resp, err := c.CreateAttestor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/DeleteAttestor/main.go b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/DeleteAttestor/main.go
index 85f6d99c827..c7f191c7f16 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/DeleteAttestor/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/DeleteAttestor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &binaryauthorizationpb.DeleteAttestorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#DeleteAttestorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#DeleteAttestorRequest.
 	}
 	err = c.DeleteAttestor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/GetAttestor/main.go b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/GetAttestor/main.go
index a15dc4ab56f..3436c4eddb8 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/GetAttestor/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/GetAttestor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &binaryauthorizationpb.GetAttestorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#GetAttestorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#GetAttestorRequest.
 	}
 	resp, err := c.GetAttestor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/GetPolicy/main.go b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/GetPolicy/main.go
index b9737323cc3..266f890d85a 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/GetPolicy/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/GetPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &binaryauthorizationpb.GetPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#GetPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#GetPolicyRequest.
 	}
 	resp, err := c.GetPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/ListAttestors/main.go b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/ListAttestors/main.go
index ec857bad323..fcd35df9526 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/ListAttestors/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/ListAttestors/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 	"google.golang.org/api/iterator"
-
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &binaryauthorizationpb.ListAttestorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#ListAttestorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#ListAttestorsRequest.
 	}
 	it := c.ListAttestors(ctx, req)
 	for {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/UpdateAttestor/main.go b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/UpdateAttestor/main.go
index 157b86b309d..60be5369197 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/UpdateAttestor/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/UpdateAttestor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &binaryauthorizationpb.UpdateAttestorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#UpdateAttestorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#UpdateAttestorRequest.
 	}
 	resp, err := c.UpdateAttestor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/UpdatePolicy/main.go b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/UpdatePolicy/main.go
index f1d6dbd35fc..76a450163ea 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/UpdatePolicy/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/BinauthzManagementClient/UpdatePolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &binaryauthorizationpb.UpdatePolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#UpdatePolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#UpdatePolicyRequest.
 	}
 	resp, err := c.UpdatePolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/SystemPolicyClient/GetSystemPolicy/main.go b/internal/generated/snippets/binaryauthorization/apiv1/SystemPolicyClient/GetSystemPolicy/main.go
index b4fa76373a8..2b81071a43d 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/SystemPolicyClient/GetSystemPolicy/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/SystemPolicyClient/GetSystemPolicy/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &binaryauthorizationpb.GetSystemPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#GetSystemPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#GetSystemPolicyRequest.
 	}
 	resp, err := c.GetSystemPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/ValidationHelperClient/ValidateAttestationOccurrence/main.go b/internal/generated/snippets/binaryauthorization/apiv1/ValidationHelperClient/ValidateAttestationOccurrence/main.go
index a4a4e202a24..6a66f4bc836 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/ValidationHelperClient/ValidateAttestationOccurrence/main.go
+++ b/internal/generated/snippets/binaryauthorization/apiv1/ValidationHelperClient/ValidateAttestationOccurrence/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	binaryauthorization "cloud.google.com/go/binaryauthorization/apiv1"
-	binaryauthorizationpb "google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1"
+	binaryauthorizationpb "cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &binaryauthorizationpb.ValidateAttestationOccurrenceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/binaryauthorization/v1#ValidateAttestationOccurrenceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/binaryauthorization/apiv1/binaryauthorizationpb#ValidateAttestationOccurrenceRequest.
 	}
 	resp, err := c.ValidateAttestationOccurrence(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/binaryauthorization/apiv1/snippet_metadata.google.cloud.binaryauthorization.v1.json b/internal/generated/snippets/binaryauthorization/apiv1/snippet_metadata.google.cloud.binaryauthorization.v1.json
index 92a7722e876..829eaaf2bd1 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1/snippet_metadata.google.cloud.binaryauthorization.v1.json
+++ b/internal/generated/snippets/binaryauthorization/apiv1/snippet_metadata.google.cloud.binaryauthorization.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/binaryauthorization/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/binaryauthorization/apiv1beta1/snippet_metadata.google.cloud.binaryauthorization.v1beta1.json b/internal/generated/snippets/binaryauthorization/apiv1beta1/snippet_metadata.google.cloud.binaryauthorization.v1beta1.json
index 6ec4d905872..b7187db1d97 100644
--- a/internal/generated/snippets/binaryauthorization/apiv1beta1/snippet_metadata.google.cloud.binaryauthorization.v1beta1.json
+++ b/internal/generated/snippets/binaryauthorization/apiv1beta1/snippet_metadata.google.cloud.binaryauthorization.v1beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/binaryauthorization/apiv1beta1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificate/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificate/main.go
index e778144a1a9..2d3e243d049 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificate/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.CreateCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateCertificateRequest.
 	}
 	op, err := c.CreateCertificate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateIssuanceConfig/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateIssuanceConfig/main.go
index d79dc31c0a7..db0922b489a 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateIssuanceConfig/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateIssuanceConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.CreateCertificateIssuanceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateCertificateIssuanceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateCertificateIssuanceConfigRequest.
 	}
 	op, err := c.CreateCertificateIssuanceConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateMap/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateMap/main.go
index 3fad026b9c4..b7057bed420 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateMap/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateMap/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.CreateCertificateMapRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateCertificateMapRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateCertificateMapRequest.
 	}
 	op, err := c.CreateCertificateMap(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateMapEntry/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateMapEntry/main.go
index ee0d3d034ba..ad8691676ff 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateMapEntry/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateCertificateMapEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.CreateCertificateMapEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateCertificateMapEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateCertificateMapEntryRequest.
 	}
 	op, err := c.CreateCertificateMapEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateDnsAuthorization/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateDnsAuthorization/main.go
index 9cf07995977..5760fb21db2 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/CreateDnsAuthorization/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/CreateDnsAuthorization/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.CreateDnsAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#CreateDnsAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#CreateDnsAuthorizationRequest.
 	}
 	op, err := c.CreateDnsAuthorization(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificate/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificate/main.go
index 00bd8323bff..c112b24e40b 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificate/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.DeleteCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteCertificateRequest.
 	}
 	op, err := c.DeleteCertificate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateIssuanceConfig/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateIssuanceConfig/main.go
index 4059999b9f0..24cd26dccb7 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateIssuanceConfig/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateIssuanceConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.DeleteCertificateIssuanceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteCertificateIssuanceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteCertificateIssuanceConfigRequest.
 	}
 	op, err := c.DeleteCertificateIssuanceConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateMap/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateMap/main.go
index aab69e37e42..146d81c191f 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateMap/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateMap/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.DeleteCertificateMapRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteCertificateMapRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteCertificateMapRequest.
 	}
 	op, err := c.DeleteCertificateMap(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateMapEntry/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateMapEntry/main.go
index 86fce9661b7..20162b7e3cd 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateMapEntry/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteCertificateMapEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.DeleteCertificateMapEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteCertificateMapEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteCertificateMapEntryRequest.
 	}
 	op, err := c.DeleteCertificateMapEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteDnsAuthorization/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteDnsAuthorization/main.go
index 30856ebb940..eb0d284e330 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteDnsAuthorization/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/DeleteDnsAuthorization/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.DeleteDnsAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#DeleteDnsAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#DeleteDnsAuthorizationRequest.
 	}
 	op, err := c.DeleteDnsAuthorization(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificate/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificate/main.go
index f2dc1dcc17d..2ec042aa032 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificate/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.GetCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetCertificateRequest.
 	}
 	resp, err := c.GetCertificate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateIssuanceConfig/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateIssuanceConfig/main.go
index de4907293ad..a2417050a8b 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateIssuanceConfig/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateIssuanceConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.GetCertificateIssuanceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetCertificateIssuanceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetCertificateIssuanceConfigRequest.
 	}
 	resp, err := c.GetCertificateIssuanceConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateMap/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateMap/main.go
index be03f3f8d24..c0a38093f84 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateMap/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateMap/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.GetCertificateMapRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetCertificateMapRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetCertificateMapRequest.
 	}
 	resp, err := c.GetCertificateMap(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateMapEntry/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateMapEntry/main.go
index c5187461353..bce696229a8 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateMapEntry/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/GetCertificateMapEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.GetCertificateMapEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetCertificateMapEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetCertificateMapEntryRequest.
 	}
 	resp, err := c.GetCertificateMapEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/GetDnsAuthorization/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/GetDnsAuthorization/main.go
index e71c1ad67d1..9eaacaf2567 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/GetDnsAuthorization/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/GetDnsAuthorization/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.GetDnsAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#GetDnsAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#GetDnsAuthorizationRequest.
 	}
 	resp, err := c.GetDnsAuthorization(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateIssuanceConfigs/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateIssuanceConfigs/main.go
index 1514cfaf559..323ff8f21e3 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateIssuanceConfigs/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateIssuanceConfigs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 	"google.golang.org/api/iterator"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &certificatemanagerpb.ListCertificateIssuanceConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificateIssuanceConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificateIssuanceConfigsRequest.
 	}
 	it := c.ListCertificateIssuanceConfigs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateMapEntries/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateMapEntries/main.go
index eb11de0fa55..c18ebf6ac61 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateMapEntries/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateMapEntries/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 	"google.golang.org/api/iterator"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &certificatemanagerpb.ListCertificateMapEntriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificateMapEntriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificateMapEntriesRequest.
 	}
 	it := c.ListCertificateMapEntries(ctx, req)
 	for {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateMaps/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateMaps/main.go
index 5d057accadc..e81421ed015 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateMaps/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificateMaps/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 	"google.golang.org/api/iterator"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &certificatemanagerpb.ListCertificateMapsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificateMapsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificateMapsRequest.
 	}
 	it := c.ListCertificateMaps(ctx, req)
 	for {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificates/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificates/main.go
index e4efae75164..07f70af6cfc 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificates/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/ListCertificates/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 	"google.golang.org/api/iterator"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &certificatemanagerpb.ListCertificatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListCertificatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListCertificatesRequest.
 	}
 	it := c.ListCertificates(ctx, req)
 	for {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/ListDnsAuthorizations/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/ListDnsAuthorizations/main.go
index 398ddd70639..6e8ebb9f311 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/ListDnsAuthorizations/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/ListDnsAuthorizations/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 	"google.golang.org/api/iterator"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &certificatemanagerpb.ListDnsAuthorizationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#ListDnsAuthorizationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#ListDnsAuthorizationsRequest.
 	}
 	it := c.ListDnsAuthorizations(ctx, req)
 	for {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificate/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificate/main.go
index 3118368d388..e426acfd3ee 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificate/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.UpdateCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#UpdateCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#UpdateCertificateRequest.
 	}
 	op, err := c.UpdateCertificate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificateMap/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificateMap/main.go
index 9f2dc54047d..a9c24f5327a 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificateMap/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificateMap/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.UpdateCertificateMapRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#UpdateCertificateMapRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#UpdateCertificateMapRequest.
 	}
 	op, err := c.UpdateCertificateMap(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificateMapEntry/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificateMapEntry/main.go
index 0e9a1f2ee19..46163306f4a 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificateMapEntry/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateCertificateMapEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.UpdateCertificateMapEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#UpdateCertificateMapEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#UpdateCertificateMapEntryRequest.
 	}
 	op, err := c.UpdateCertificateMapEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateDnsAuthorization/main.go b/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateDnsAuthorization/main.go
index 4822fd2714b..98299838ab0 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateDnsAuthorization/main.go
+++ b/internal/generated/snippets/certificatemanager/apiv1/Client/UpdateDnsAuthorization/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	certificatemanager "cloud.google.com/go/certificatemanager/apiv1"
-
-	certificatemanagerpb "google.golang.org/genproto/googleapis/cloud/certificatemanager/v1"
+	certificatemanagerpb "cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &certificatemanagerpb.UpdateDnsAuthorizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/certificatemanager/v1#UpdateDnsAuthorizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/certificatemanager/apiv1/certificatemanagerpb#UpdateDnsAuthorizationRequest.
 	}
 	op, err := c.UpdateDnsAuthorization(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/certificatemanager/apiv1/snippet_metadata.google.cloud.certificatemanager.v1.json b/internal/generated/snippets/certificatemanager/apiv1/snippet_metadata.google.cloud.certificatemanager.v1.json
index fb9bf2b78f3..199ed076f28 100644
--- a/internal/generated/snippets/certificatemanager/apiv1/snippet_metadata.google.cloud.certificatemanager.v1.json
+++ b/internal/generated/snippets/certificatemanager/apiv1/snippet_metadata.google.cloud.certificatemanager.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/certificatemanager/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -419,7 +419,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -465,7 +465,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -511,7 +511,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -648,7 +648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -694,7 +694,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -740,7 +740,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -786,7 +786,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -924,7 +924,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -970,7 +970,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1016,7 +1016,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1062,7 +1062,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1108,7 +1108,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1246,7 +1246,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1292,7 +1292,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1338,7 +1338,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1384,7 +1384,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ActivateEntitlement/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ActivateEntitlement/main.go
index c9c72fb11c0..307c7719cc0 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ActivateEntitlement/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ActivateEntitlement/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.ActivateEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ActivateEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ActivateEntitlementRequest.
 	}
 	op, err := c.ActivateEntitlement(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CancelEntitlement/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CancelEntitlement/main.go
index 4f7f4987bf7..82dfb2b4de0 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CancelEntitlement/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CancelEntitlement/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.CancelEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CancelEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CancelEntitlementRequest.
 	}
 	op, err := c.CancelEntitlement(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeOffer/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeOffer/main.go
index 6d975104ee5..7316a04766f 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeOffer/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeOffer/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.ChangeOfferRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ChangeOfferRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ChangeOfferRequest.
 	}
 	op, err := c.ChangeOffer(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeParameters/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeParameters/main.go
index 688594a55ba..23da86216c0 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeParameters/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeParameters/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.ChangeParametersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ChangeParametersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ChangeParametersRequest.
 	}
 	op, err := c.ChangeParameters(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeRenewalSettings/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeRenewalSettings/main.go
index 9ad72e33802..eaf82109cf8 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeRenewalSettings/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ChangeRenewalSettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.ChangeRenewalSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ChangeRenewalSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ChangeRenewalSettingsRequest.
 	}
 	op, err := c.ChangeRenewalSettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CheckCloudIdentityAccountsExist/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CheckCloudIdentityAccountsExist/main.go
index 5c5bec51004..3fae75c671c 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CheckCloudIdentityAccountsExist/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CheckCloudIdentityAccountsExist/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.CheckCloudIdentityAccountsExistRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CheckCloudIdentityAccountsExistRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CheckCloudIdentityAccountsExistRequest.
 	}
 	resp, err := c.CheckCloudIdentityAccountsExist(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateChannelPartnerLink/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateChannelPartnerLink/main.go
index 1bfc45a6a61..5a0997da15c 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateChannelPartnerLink/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateChannelPartnerLink/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.CreateChannelPartnerLinkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateChannelPartnerLinkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateChannelPartnerLinkRequest.
 	}
 	resp, err := c.CreateChannelPartnerLink(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateChannelPartnerRepricingConfig/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateChannelPartnerRepricingConfig/main.go
index b7e19784a15..6a302e21800 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateChannelPartnerRepricingConfig/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateChannelPartnerRepricingConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.CreateChannelPartnerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateChannelPartnerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateChannelPartnerRepricingConfigRequest.
 	}
 	resp, err := c.CreateChannelPartnerRepricingConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateCustomer/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateCustomer/main.go
index 3f45c9fbcdf..7d2e2e65220 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateCustomer/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateCustomer/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.CreateCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateCustomerRequest.
 	}
 	resp, err := c.CreateCustomer(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateCustomerRepricingConfig/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateCustomerRepricingConfig/main.go
index 5fc4501e4e9..f2a17c933d6 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateCustomerRepricingConfig/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateCustomerRepricingConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.CreateCustomerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateCustomerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateCustomerRepricingConfigRequest.
 	}
 	resp, err := c.CreateCustomerRepricingConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateEntitlement/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateEntitlement/main.go
index 0a5794a2392..d59da69fec2 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateEntitlement/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/CreateEntitlement/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.CreateEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#CreateEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#CreateEntitlementRequest.
 	}
 	op, err := c.CreateEntitlement(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteChannelPartnerRepricingConfig/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteChannelPartnerRepricingConfig/main.go
index 64f04d9b65e..e8ca037717c 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteChannelPartnerRepricingConfig/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteChannelPartnerRepricingConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.DeleteChannelPartnerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#DeleteChannelPartnerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#DeleteChannelPartnerRepricingConfigRequest.
 	}
 	err = c.DeleteChannelPartnerRepricingConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteCustomer/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteCustomer/main.go
index 3bf9af0eb84..d0ade8ab5d1 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteCustomer/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteCustomer/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.DeleteCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#DeleteCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#DeleteCustomerRequest.
 	}
 	err = c.DeleteCustomer(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteCustomerRepricingConfig/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteCustomerRepricingConfig/main.go
index ba9e00145da..eefaf063275 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteCustomerRepricingConfig/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/DeleteCustomerRepricingConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.DeleteCustomerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#DeleteCustomerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#DeleteCustomerRepricingConfigRequest.
 	}
 	err = c.DeleteCustomerRepricingConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetChannelPartnerLink/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetChannelPartnerLink/main.go
index 574bc35becd..c2bcdd8aea2 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetChannelPartnerLink/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetChannelPartnerLink/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.GetChannelPartnerLinkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetChannelPartnerLinkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetChannelPartnerLinkRequest.
 	}
 	resp, err := c.GetChannelPartnerLink(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetChannelPartnerRepricingConfig/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetChannelPartnerRepricingConfig/main.go
index 22a346d7809..7ffd167d006 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetChannelPartnerRepricingConfig/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetChannelPartnerRepricingConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.GetChannelPartnerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetChannelPartnerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetChannelPartnerRepricingConfigRequest.
 	}
 	resp, err := c.GetChannelPartnerRepricingConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetCustomer/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetCustomer/main.go
index 283d2d84400..c074af8bbb6 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetCustomer/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetCustomer/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.GetCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetCustomerRequest.
 	}
 	resp, err := c.GetCustomer(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetCustomerRepricingConfig/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetCustomerRepricingConfig/main.go
index 61d3bdf2adf..d30140d60cc 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetCustomerRepricingConfig/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetCustomerRepricingConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.GetCustomerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetCustomerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetCustomerRepricingConfigRequest.
 	}
 	resp, err := c.GetCustomerRepricingConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetEntitlement/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetEntitlement/main.go
index 8e6488dac71..e7279a8bc3b 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetEntitlement/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/GetEntitlement/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.GetEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#GetEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#GetEntitlementRequest.
 	}
 	resp, err := c.GetEntitlement(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ImportCustomer/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ImportCustomer/main.go
index c350925097f..5427ce5aeb8 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ImportCustomer/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ImportCustomer/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.ImportCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ImportCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ImportCustomerRequest.
 	}
 	resp, err := c.ImportCustomer(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListChannelPartnerLinks/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListChannelPartnerLinks/main.go
index 4c6aa771506..4508e24205e 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListChannelPartnerLinks/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListChannelPartnerLinks/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListChannelPartnerLinksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListChannelPartnerLinksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListChannelPartnerLinksRequest.
 	}
 	it := c.ListChannelPartnerLinks(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListChannelPartnerRepricingConfigs/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListChannelPartnerRepricingConfigs/main.go
index 32b1c449296..a35c7d2e7a3 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListChannelPartnerRepricingConfigs/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListChannelPartnerRepricingConfigs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListChannelPartnerRepricingConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListChannelPartnerRepricingConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListChannelPartnerRepricingConfigsRequest.
 	}
 	it := c.ListChannelPartnerRepricingConfigs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListCustomerRepricingConfigs/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListCustomerRepricingConfigs/main.go
index dee00cf70f1..95da579a55a 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListCustomerRepricingConfigs/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListCustomerRepricingConfigs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListCustomerRepricingConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListCustomerRepricingConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListCustomerRepricingConfigsRequest.
 	}
 	it := c.ListCustomerRepricingConfigs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListCustomers/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListCustomers/main.go
index a0ef3275123..d56013f8393 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListCustomers/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListCustomers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListCustomersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListCustomersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListCustomersRequest.
 	}
 	it := c.ListCustomers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListEntitlements/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListEntitlements/main.go
index 6541e7c7f5a..f01160c3c54 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListEntitlements/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListEntitlements/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListEntitlementsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListEntitlementsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListEntitlementsRequest.
 	}
 	it := c.ListEntitlements(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListOffers/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListOffers/main.go
index ce8f4389574..ca97fb0f85f 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListOffers/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListOffers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListOffersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListOffersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListOffersRequest.
 	}
 	it := c.ListOffers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListProducts/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListProducts/main.go
index 65a03a12a88..4be1b9b4250 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListProducts/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListProducts/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListProductsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListProductsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListProductsRequest.
 	}
 	it := c.ListProducts(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListPurchasableOffers/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListPurchasableOffers/main.go
index 58c61b97539..83f8b9ad6b2 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListPurchasableOffers/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListPurchasableOffers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListPurchasableOffersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListPurchasableOffersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListPurchasableOffersRequest.
 	}
 	it := c.ListPurchasableOffers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListPurchasableSkus/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListPurchasableSkus/main.go
index 70b8cfd2baa..a6e08cf0786 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListPurchasableSkus/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListPurchasableSkus/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListPurchasableSkusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListPurchasableSkusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListPurchasableSkusRequest.
 	}
 	it := c.ListPurchasableSkus(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListSkus/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListSkus/main.go
index 7c75792867d..ebbebc4a9f0 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListSkus/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListSkus/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListSkusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListSkusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListSkusRequest.
 	}
 	it := c.ListSkus(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListSubscribers/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListSubscribers/main.go
index af35e704a87..00f3e6b0fd9 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListSubscribers/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListSubscribers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListSubscribersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListSubscribersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListSubscribersRequest.
 	}
 	it := c.ListSubscribers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListTransferableOffers/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListTransferableOffers/main.go
index 5c28da0d57e..2d750cbd95b 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListTransferableOffers/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListTransferableOffers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListTransferableOffersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListTransferableOffersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListTransferableOffersRequest.
 	}
 	it := c.ListTransferableOffers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListTransferableSkus/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListTransferableSkus/main.go
index 4605ffb8f1d..85a8213895e 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListTransferableSkus/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ListTransferableSkus/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListTransferableSkusRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListTransferableSkusRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListTransferableSkusRequest.
 	}
 	it := c.ListTransferableSkus(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/LookupOffer/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/LookupOffer/main.go
index 592fd57f708..ce5322905df 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/LookupOffer/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/LookupOffer/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.LookupOfferRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#LookupOfferRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#LookupOfferRequest.
 	}
 	resp, err := c.LookupOffer(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ProvisionCloudIdentity/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ProvisionCloudIdentity/main.go
index 7ee762a7207..72ff62610af 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/ProvisionCloudIdentity/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/ProvisionCloudIdentity/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.ProvisionCloudIdentityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ProvisionCloudIdentityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ProvisionCloudIdentityRequest.
 	}
 	op, err := c.ProvisionCloudIdentity(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/RegisterSubscriber/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/RegisterSubscriber/main.go
index 4af9cb674c6..061db74cd88 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/RegisterSubscriber/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/RegisterSubscriber/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.RegisterSubscriberRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#RegisterSubscriberRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#RegisterSubscriberRequest.
 	}
 	resp, err := c.RegisterSubscriber(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/StartPaidService/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/StartPaidService/main.go
index eaa7dde8719..432c2d9855a 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/StartPaidService/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/StartPaidService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.StartPaidServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#StartPaidServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#StartPaidServiceRequest.
 	}
 	op, err := c.StartPaidService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/SuspendEntitlement/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/SuspendEntitlement/main.go
index aaf4529ed37..7e8a3cd03be 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/SuspendEntitlement/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/SuspendEntitlement/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.SuspendEntitlementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#SuspendEntitlementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#SuspendEntitlementRequest.
 	}
 	op, err := c.SuspendEntitlement(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/TransferEntitlements/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/TransferEntitlements/main.go
index 13c728cd020..df9785c9c4b 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/TransferEntitlements/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/TransferEntitlements/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.TransferEntitlementsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#TransferEntitlementsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#TransferEntitlementsRequest.
 	}
 	op, err := c.TransferEntitlements(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/TransferEntitlementsToGoogle/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/TransferEntitlementsToGoogle/main.go
index b4cc895b2d4..905d764c386 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/TransferEntitlementsToGoogle/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/TransferEntitlementsToGoogle/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.TransferEntitlementsToGoogleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#TransferEntitlementsToGoogleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#TransferEntitlementsToGoogleRequest.
 	}
 	op, err := c.TransferEntitlementsToGoogle(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UnregisterSubscriber/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UnregisterSubscriber/main.go
index 28ada3beac1..f65ad68558b 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UnregisterSubscriber/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UnregisterSubscriber/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.UnregisterSubscriberRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UnregisterSubscriberRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UnregisterSubscriberRequest.
 	}
 	resp, err := c.UnregisterSubscriber(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateChannelPartnerLink/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateChannelPartnerLink/main.go
index 4aae9bb817c..0c594f01b0f 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateChannelPartnerLink/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateChannelPartnerLink/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.UpdateChannelPartnerLinkRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UpdateChannelPartnerLinkRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UpdateChannelPartnerLinkRequest.
 	}
 	resp, err := c.UpdateChannelPartnerLink(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateChannelPartnerRepricingConfig/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateChannelPartnerRepricingConfig/main.go
index 20b6f04e569..f7038d660b4 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateChannelPartnerRepricingConfig/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateChannelPartnerRepricingConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.UpdateChannelPartnerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UpdateChannelPartnerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UpdateChannelPartnerRepricingConfigRequest.
 	}
 	resp, err := c.UpdateChannelPartnerRepricingConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateCustomer/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateCustomer/main.go
index dad31318942..2bf3a5dc133 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateCustomer/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateCustomer/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.UpdateCustomerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UpdateCustomerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UpdateCustomerRequest.
 	}
 	resp, err := c.UpdateCustomer(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateCustomerRepricingConfig/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateCustomerRepricingConfig/main.go
index 5db5c6e0dc1..4578099e92f 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateCustomerRepricingConfig/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelClient/UpdateCustomerRepricingConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.UpdateCustomerRepricingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#UpdateCustomerRepricingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#UpdateCustomerRepricingConfigRequest.
 	}
 	resp, err := c.UpdateCustomerRepricingConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/FetchReportResults/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/FetchReportResults/main.go
index 6cbcd0b358b..caa66af3a19 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/FetchReportResults/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/FetchReportResults/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.FetchReportResultsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#FetchReportResultsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#FetchReportResultsRequest.
 	}
 	it := c.FetchReportResults(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/ListReports/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/ListReports/main.go
index 38c84d4cdac..8c559f9de91 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/ListReports/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/ListReports/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 	"google.golang.org/api/iterator"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &channelpb.ListReportsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#ListReportsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#ListReportsRequest.
 	}
 	it := c.ListReports(ctx, req)
 	for {
diff --git a/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/RunReportJob/main.go b/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/RunReportJob/main.go
index 525740fb8a9..9552fab9ced 100644
--- a/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/RunReportJob/main.go
+++ b/internal/generated/snippets/channel/apiv1/CloudChannelReportsClient/RunReportJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	channel "cloud.google.com/go/channel/apiv1"
-
-	channelpb "google.golang.org/genproto/googleapis/cloud/channel/v1"
+	channelpb "cloud.google.com/go/channel/apiv1/channelpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &channelpb.RunReportJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/channel/v1#RunReportJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/channel/apiv1/channelpb#RunReportJobRequest.
 	}
 	op, err := c.RunReportJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/channel/apiv1/snippet_metadata.google.cloud.channel.v1.json b/internal/generated/snippets/channel/apiv1/snippet_metadata.google.cloud.channel.v1.json
index 47b76adcf49..52fd81fa13f 100644
--- a/internal/generated/snippets/channel/apiv1/snippet_metadata.google.cloud.channel.v1.json
+++ b/internal/generated/snippets/channel/apiv1/snippet_metadata.google.cloud.channel.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/channel/apiv1",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -419,7 +419,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -465,7 +465,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -511,7 +511,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -557,7 +557,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -647,7 +647,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -692,7 +692,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -783,7 +783,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -829,7 +829,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -875,7 +875,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -921,7 +921,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -967,7 +967,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1059,7 +1059,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1105,7 +1105,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1151,7 +1151,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1197,7 +1197,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1243,7 +1243,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1289,7 +1289,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1335,7 +1335,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1427,7 +1427,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1473,7 +1473,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1519,7 +1519,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1565,7 +1565,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1611,7 +1611,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1657,7 +1657,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1703,7 +1703,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1749,7 +1749,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1795,7 +1795,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1841,7 +1841,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1887,7 +1887,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1933,7 +1933,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1979,7 +1979,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -2025,7 +2025,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -2071,7 +2071,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2117,7 +2117,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2163,7 +2163,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2209,7 +2209,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2255,7 +2255,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2391,7 +2391,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2529,7 +2529,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2575,7 +2575,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ApproveBuild/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ApproveBuild/main.go
index 454587c86d0..f295d2c04a1 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ApproveBuild/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ApproveBuild/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.ApproveBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ApproveBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ApproveBuildRequest.
 	}
 	op, err := c.ApproveBuild(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CancelBuild/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CancelBuild/main.go
index d3b1555f627..17dffb89fa1 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CancelBuild/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CancelBuild/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.CancelBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CancelBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CancelBuildRequest.
 	}
 	resp, err := c.CancelBuild(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateBuild/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateBuild/main.go
index c4b48c8451a..dbe28ebb1b3 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateBuild/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateBuild/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.CreateBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CreateBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CreateBuildRequest.
 	}
 	op, err := c.CreateBuild(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateBuildTrigger/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateBuildTrigger/main.go
index 80600ae7d1e..6a51dec2ed6 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateBuildTrigger/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateBuildTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.CreateBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CreateBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CreateBuildTriggerRequest.
 	}
 	resp, err := c.CreateBuildTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateWorkerPool/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateWorkerPool/main.go
index e25dc8ebb21..a04a4a59a12 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateWorkerPool/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/CreateWorkerPool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.CreateWorkerPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#CreateWorkerPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#CreateWorkerPoolRequest.
 	}
 	op, err := c.CreateWorkerPool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/DeleteBuildTrigger/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/DeleteBuildTrigger/main.go
index 9f5d21ef341..5cfc545fe48 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/DeleteBuildTrigger/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/DeleteBuildTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.DeleteBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#DeleteBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#DeleteBuildTriggerRequest.
 	}
 	err = c.DeleteBuildTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/DeleteWorkerPool/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/DeleteWorkerPool/main.go
index 1ea3f055fd6..9b8c572ba86 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/DeleteWorkerPool/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/DeleteWorkerPool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.DeleteWorkerPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#DeleteWorkerPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#DeleteWorkerPoolRequest.
 	}
 	op, err := c.DeleteWorkerPool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetBuild/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetBuild/main.go
index c706db461ea..c6c106d35a8 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetBuild/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetBuild/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.GetBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#GetBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#GetBuildRequest.
 	}
 	resp, err := c.GetBuild(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetBuildTrigger/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetBuildTrigger/main.go
index ad6ddb12648..73d2d0d65aa 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetBuildTrigger/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetBuildTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.GetBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#GetBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#GetBuildTriggerRequest.
 	}
 	resp, err := c.GetBuildTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetWorkerPool/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetWorkerPool/main.go
index a7ec6af9781..f2e5efe0217 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetWorkerPool/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/GetWorkerPool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.GetWorkerPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#GetWorkerPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#GetWorkerPoolRequest.
 	}
 	resp, err := c.GetWorkerPool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListBuildTriggers/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListBuildTriggers/main.go
index f8ff5242934..992df0b6705 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListBuildTriggers/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListBuildTriggers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 	"google.golang.org/api/iterator"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cloudbuildpb.ListBuildTriggersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ListBuildTriggersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ListBuildTriggersRequest.
 	}
 	it := c.ListBuildTriggers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListBuilds/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListBuilds/main.go
index 1607bfabec1..be2e35ccb58 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListBuilds/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListBuilds/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 	"google.golang.org/api/iterator"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cloudbuildpb.ListBuildsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ListBuildsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ListBuildsRequest.
 	}
 	it := c.ListBuilds(ctx, req)
 	for {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListWorkerPools/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListWorkerPools/main.go
index dd81d31ee18..fa1eeccc3ae 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListWorkerPools/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ListWorkerPools/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 	"google.golang.org/api/iterator"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cloudbuildpb.ListWorkerPoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ListWorkerPoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ListWorkerPoolsRequest.
 	}
 	it := c.ListWorkerPools(ctx, req)
 	for {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ReceiveTriggerWebhook/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ReceiveTriggerWebhook/main.go
index 9fe40d8419b..eb17abf59db 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ReceiveTriggerWebhook/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/ReceiveTriggerWebhook/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.ReceiveTriggerWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#ReceiveTriggerWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#ReceiveTriggerWebhookRequest.
 	}
 	resp, err := c.ReceiveTriggerWebhook(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/RetryBuild/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/RetryBuild/main.go
index 3fb868c5f1a..1cf18e17994 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/RetryBuild/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/RetryBuild/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.RetryBuildRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#RetryBuildRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#RetryBuildRequest.
 	}
 	op, err := c.RetryBuild(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/RunBuildTrigger/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/RunBuildTrigger/main.go
index 382c6bda647..c6dc2a67ba6 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/RunBuildTrigger/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/RunBuildTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.RunBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#RunBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#RunBuildTriggerRequest.
 	}
 	op, err := c.RunBuildTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/UpdateBuildTrigger/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/UpdateBuildTrigger/main.go
index 791c54ae1b9..7550898c6f5 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/UpdateBuildTrigger/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/UpdateBuildTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.UpdateBuildTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#UpdateBuildTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#UpdateBuildTriggerRequest.
 	}
 	resp, err := c.UpdateBuildTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/UpdateWorkerPool/main.go b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/UpdateWorkerPool/main.go
index 926e3e45a68..b801a23164b 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/Client/UpdateWorkerPool/main.go
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/Client/UpdateWorkerPool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
-
-	cloudbuildpb "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1"
+	cloudbuildpb "cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cloudbuildpb.UpdateWorkerPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudbuild/v1#UpdateWorkerPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb#UpdateWorkerPoolRequest.
 	}
 	op, err := c.UpdateWorkerPool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudbuild/apiv1/v2/snippet_metadata.google.devtools.cloudbuild.v1.json b/internal/generated/snippets/cloudbuild/apiv1/v2/snippet_metadata.google.devtools.cloudbuild.v1.json
index fec35c661c8..70277d89b09 100644
--- a/internal/generated/snippets/cloudbuild/apiv1/v2/snippet_metadata.google.devtools.cloudbuild.v1.json
+++ b/internal/generated/snippets/cloudbuild/apiv1/v2/snippet_metadata.google.devtools.cloudbuild.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/cloudbuild/apiv1/v2",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -419,7 +419,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -465,7 +465,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -511,7 +511,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -557,7 +557,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -603,7 +603,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -649,7 +649,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -695,7 +695,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -741,7 +741,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -787,7 +787,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -833,7 +833,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/CreateConnectionProfile/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/CreateConnectionProfile/main.go
index 8dc0b23cdd2..cf057168bd3 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/CreateConnectionProfile/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/CreateConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.CreateConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#CreateConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#CreateConnectionProfileRequest.
 	}
 	op, err := c.CreateConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/CreateMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/CreateMigrationJob/main.go
index 36275fa817f..19c6bf61c1e 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/CreateMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/CreateMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.CreateMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#CreateMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#CreateMigrationJobRequest.
 	}
 	op, err := c.CreateMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/DeleteConnectionProfile/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/DeleteConnectionProfile/main.go
index 0b51a6b4dd1..38bc9c37b63 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/DeleteConnectionProfile/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/DeleteConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.DeleteConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#DeleteConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#DeleteConnectionProfileRequest.
 	}
 	op, err := c.DeleteConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/DeleteMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/DeleteMigrationJob/main.go
index 6d33b7a580e..dec87fa0bc2 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/DeleteMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/DeleteMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.DeleteMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#DeleteMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#DeleteMigrationJobRequest.
 	}
 	op, err := c.DeleteMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GenerateSshScript/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GenerateSshScript/main.go
index 1c0c20fa6e1..9991d9d9b50 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GenerateSshScript/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GenerateSshScript/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.GenerateSshScriptRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#GenerateSshScriptRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#GenerateSshScriptRequest.
 	}
 	resp, err := c.GenerateSshScript(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GetConnectionProfile/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GetConnectionProfile/main.go
index 9cd8312b98a..7d4901e743a 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GetConnectionProfile/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GetConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.GetConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#GetConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#GetConnectionProfileRequest.
 	}
 	resp, err := c.GetConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GetMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GetMigrationJob/main.go
index 228d5ccb5c9..f0e8c2df8de 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GetMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/GetMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.GetMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#GetMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#GetMigrationJobRequest.
 	}
 	resp, err := c.GetMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ListConnectionProfiles/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ListConnectionProfiles/main.go
index 61b009db6d6..b907660fd95 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ListConnectionProfiles/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ListConnectionProfiles/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 	"google.golang.org/api/iterator"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &clouddmspb.ListConnectionProfilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#ListConnectionProfilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#ListConnectionProfilesRequest.
 	}
 	it := c.ListConnectionProfiles(ctx, req)
 	for {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ListMigrationJobs/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ListMigrationJobs/main.go
index 11702b3c245..24459427e67 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ListMigrationJobs/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ListMigrationJobs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 	"google.golang.org/api/iterator"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &clouddmspb.ListMigrationJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#ListMigrationJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#ListMigrationJobsRequest.
 	}
 	it := c.ListMigrationJobs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/PromoteMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/PromoteMigrationJob/main.go
index 085a490aeab..304a19c8da4 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/PromoteMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/PromoteMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.PromoteMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#PromoteMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#PromoteMigrationJobRequest.
 	}
 	op, err := c.PromoteMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/RestartMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/RestartMigrationJob/main.go
index 3c05bd0e6ba..cd9a1efadfe 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/RestartMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/RestartMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.RestartMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#RestartMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#RestartMigrationJobRequest.
 	}
 	op, err := c.RestartMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ResumeMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ResumeMigrationJob/main.go
index 7dcdd0199fa..729e255d1b0 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ResumeMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/ResumeMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.ResumeMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#ResumeMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#ResumeMigrationJobRequest.
 	}
 	op, err := c.ResumeMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/StartMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/StartMigrationJob/main.go
index df5f3a1efb3..c64991f616b 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/StartMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/StartMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.StartMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#StartMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#StartMigrationJobRequest.
 	}
 	op, err := c.StartMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/StopMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/StopMigrationJob/main.go
index d316c9c791d..227ae411c5b 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/StopMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/StopMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.StopMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#StopMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#StopMigrationJobRequest.
 	}
 	op, err := c.StopMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/UpdateConnectionProfile/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/UpdateConnectionProfile/main.go
index 7eedeb3745c..279dceeb7cf 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/UpdateConnectionProfile/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/UpdateConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.UpdateConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#UpdateConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#UpdateConnectionProfileRequest.
 	}
 	op, err := c.UpdateConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/UpdateMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/UpdateMigrationJob/main.go
index 6063f7b7794..263133b73ff 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/UpdateMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/UpdateMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.UpdateMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#UpdateMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#UpdateMigrationJobRequest.
 	}
 	op, err := c.UpdateMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/VerifyMigrationJob/main.go b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/VerifyMigrationJob/main.go
index 361510cc922..5c0704e1854 100644
--- a/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/VerifyMigrationJob/main.go
+++ b/internal/generated/snippets/clouddms/apiv1/DataMigrationClient/VerifyMigrationJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	clouddms "cloud.google.com/go/clouddms/apiv1"
-
-	clouddmspb "google.golang.org/genproto/googleapis/cloud/clouddms/v1"
+	clouddmspb "cloud.google.com/go/clouddms/apiv1/clouddmspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &clouddmspb.VerifyMigrationJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/clouddms/v1#VerifyMigrationJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/clouddms/apiv1/clouddmspb#VerifyMigrationJobRequest.
 	}
 	op, err := c.VerifyMigrationJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/clouddms/apiv1/snippet_metadata.google.cloud.clouddms.v1.json b/internal/generated/snippets/clouddms/apiv1/snippet_metadata.google.cloud.clouddms.v1.json
index cb2a564ae78..f8e2a5aeace 100644
--- a/internal/generated/snippets/clouddms/apiv1/snippet_metadata.google.cloud.clouddms.v1.json
+++ b/internal/generated/snippets/clouddms/apiv1/snippet_metadata.google.cloud.clouddms.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/clouddms/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -742,7 +742,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -788,7 +788,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/CreateQueue/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/CreateQueue/main.go
index a221bc387db..b251c5de757 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/CreateQueue/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/CreateQueue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.CreateQueueRequest{
+	req := &cloudtaskspb.CreateQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#CreateQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#CreateQueueRequest.
 	}
 	resp, err := c.CreateQueue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/CreateTask/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/CreateTask/main.go
index 649b75a10ec..342fbadd9bc 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/CreateTask/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/CreateTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.CreateTaskRequest{
+	req := &cloudtaskspb.CreateTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#CreateTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#CreateTaskRequest.
 	}
 	resp, err := c.CreateTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/DeleteQueue/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/DeleteQueue/main.go
index fe7e56ef7a3..803fa669157 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/DeleteQueue/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/DeleteQueue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.DeleteQueueRequest{
+	req := &cloudtaskspb.DeleteQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#DeleteQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#DeleteQueueRequest.
 	}
 	err = c.DeleteQueue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/DeleteTask/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/DeleteTask/main.go
index 9fda66226bc..6ec3ab9dd93 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/DeleteTask/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/DeleteTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.DeleteTaskRequest{
+	req := &cloudtaskspb.DeleteTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#DeleteTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#DeleteTaskRequest.
 	}
 	err = c.DeleteTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/GetQueue/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/GetQueue/main.go
index a83275bbc92..fd7bc85bdee 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/GetQueue/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/GetQueue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.GetQueueRequest{
+	req := &cloudtaskspb.GetQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#GetQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#GetQueueRequest.
 	}
 	resp, err := c.GetQueue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/GetTask/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/GetTask/main.go
index cac49143b22..9fbd6333278 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/GetTask/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/GetTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.GetTaskRequest{
+	req := &cloudtaskspb.GetTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#GetTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#GetTaskRequest.
 	}
 	resp, err := c.GetTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/ListQueues/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/ListQueues/main.go
index 9fa66d303b0..a671b0d591a 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/ListQueues/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/ListQueues/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 	"google.golang.org/api/iterator"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
 )
 
 func main() {
@@ -40,9 +39,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.ListQueuesRequest{
+	req := &cloudtaskspb.ListQueuesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#ListQueuesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#ListQueuesRequest.
 	}
 	it := c.ListQueues(ctx, req)
 	for {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/ListTasks/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/ListTasks/main.go
index 05958f48cfa..bc8cd82e0b0 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/ListTasks/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/ListTasks/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 	"google.golang.org/api/iterator"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
 )
 
 func main() {
@@ -40,9 +39,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.ListTasksRequest{
+	req := &cloudtaskspb.ListTasksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#ListTasksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#ListTasksRequest.
 	}
 	it := c.ListTasks(ctx, req)
 	for {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/PauseQueue/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/PauseQueue/main.go
index f7ab8731258..2524c41294e 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/PauseQueue/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/PauseQueue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.PauseQueueRequest{
+	req := &cloudtaskspb.PauseQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#PauseQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#PauseQueueRequest.
 	}
 	resp, err := c.PauseQueue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/PurgeQueue/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/PurgeQueue/main.go
index 33601e2f852..d384cdd15f6 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/PurgeQueue/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/PurgeQueue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.PurgeQueueRequest{
+	req := &cloudtaskspb.PurgeQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#PurgeQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#PurgeQueueRequest.
 	}
 	resp, err := c.PurgeQueue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/ResumeQueue/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/ResumeQueue/main.go
index 7fa4d854724..2a70adff02e 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/ResumeQueue/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/ResumeQueue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.ResumeQueueRequest{
+	req := &cloudtaskspb.ResumeQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#ResumeQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#ResumeQueueRequest.
 	}
 	resp, err := c.ResumeQueue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/RunTask/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/RunTask/main.go
index 4baa662745e..b33eb49b450 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/RunTask/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/RunTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.RunTaskRequest{
+	req := &cloudtaskspb.RunTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#RunTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#RunTaskRequest.
 	}
 	resp, err := c.RunTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/Client/UpdateQueue/main.go b/internal/generated/snippets/cloudtasks/apiv2/Client/UpdateQueue/main.go
index 2544b82eac9..4542a33ffae 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/Client/UpdateQueue/main.go
+++ b/internal/generated/snippets/cloudtasks/apiv2/Client/UpdateQueue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
-
-	taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+	cloudtaskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
 )
 
 func main() {
@@ -39,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &taskspb.UpdateQueueRequest{
+	req := &cloudtaskspb.UpdateQueueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#UpdateQueueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb#UpdateQueueRequest.
 	}
 	resp, err := c.UpdateQueue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/cloudtasks/apiv2/snippet_metadata.google.cloud.tasks.v2.json b/internal/generated/snippets/cloudtasks/apiv2/snippet_metadata.google.cloud.tasks.v2.json
index 0d8752b3f0e..2e6418909f0 100644
--- a/internal/generated/snippets/cloudtasks/apiv2/snippet_metadata.google.cloud.tasks.v2.json
+++ b/internal/generated/snippets/cloudtasks/apiv2/snippet_metadata.google.cloud.tasks.v2.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/cloudtasks/apiv2",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
@@ -26,7 +26,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.CreateQueueRequest",
+            "type": "cloudtaskspb.CreateQueueRequest",
             "name": "req"
           },
           {
@@ -34,7 +34,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Queue",
+        "resultType": "cloudtaskspb.Queue",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -72,7 +72,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.CreateTaskRequest",
+            "type": "cloudtaskspb.CreateTaskRequest",
             "name": "req"
           },
           {
@@ -80,7 +80,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Task",
+        "resultType": "cloudtaskspb.Task",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -118,7 +118,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.DeleteQueueRequest",
+            "type": "cloudtaskspb.DeleteQueueRequest",
             "name": "req"
           },
           {
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -163,7 +163,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.DeleteTaskRequest",
+            "type": "cloudtaskspb.DeleteTaskRequest",
             "name": "req"
           },
           {
@@ -188,7 +188,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -254,7 +254,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.GetQueueRequest",
+            "type": "cloudtaskspb.GetQueueRequest",
             "name": "req"
           },
           {
@@ -262,7 +262,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Queue",
+        "resultType": "cloudtaskspb.Queue",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -280,7 +280,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -300,7 +300,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.GetTaskRequest",
+            "type": "cloudtaskspb.GetTaskRequest",
             "name": "req"
           },
           {
@@ -308,7 +308,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Task",
+        "resultType": "cloudtaskspb.Task",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -326,7 +326,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -346,7 +346,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.ListQueuesRequest",
+            "type": "cloudtaskspb.ListQueuesRequest",
             "name": "req"
           },
           {
@@ -372,7 +372,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -392,7 +392,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.ListTasksRequest",
+            "type": "cloudtaskspb.ListTasksRequest",
             "name": "req"
           },
           {
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -438,7 +438,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.PauseQueueRequest",
+            "type": "cloudtaskspb.PauseQueueRequest",
             "name": "req"
           },
           {
@@ -446,7 +446,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Queue",
+        "resultType": "cloudtaskspb.Queue",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -464,7 +464,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -484,7 +484,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.PurgeQueueRequest",
+            "type": "cloudtaskspb.PurgeQueueRequest",
             "name": "req"
           },
           {
@@ -492,7 +492,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Queue",
+        "resultType": "cloudtaskspb.Queue",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -510,7 +510,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -530,7 +530,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.ResumeQueueRequest",
+            "type": "cloudtaskspb.ResumeQueueRequest",
             "name": "req"
           },
           {
@@ -538,7 +538,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Queue",
+        "resultType": "cloudtaskspb.Queue",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -576,7 +576,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.RunTaskRequest",
+            "type": "cloudtaskspb.RunTaskRequest",
             "name": "req"
           },
           {
@@ -584,7 +584,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Task",
+        "resultType": "cloudtaskspb.Task",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -714,7 +714,7 @@
             "name": "ctx"
           },
           {
-            "type": "taskspb.UpdateQueueRequest",
+            "type": "cloudtaskspb.UpdateQueueRequest",
             "name": "req"
           },
           {
@@ -722,7 +722,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "taskspb.Queue",
+        "resultType": "cloudtaskspb.Queue",
         "client": {
           "shortName": "Client",
           "fullName": "google.cloud.tasks.v2.Client"
@@ -740,7 +740,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/cloudtasks/apiv2beta2/snippet_metadata.google.cloud.tasks.v2beta2.json b/internal/generated/snippets/cloudtasks/apiv2beta2/snippet_metadata.google.cloud.tasks.v2beta2.json
index 3315bbafb02..a0dddfcff12 100644
--- a/internal/generated/snippets/cloudtasks/apiv2beta2/snippet_metadata.google.cloud.tasks.v2beta2.json
+++ b/internal/generated/snippets/cloudtasks/apiv2beta2/snippet_metadata.google.cloud.tasks.v2beta2.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/cloudtasks/apiv2beta2",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/cloudtasks/apiv2beta3/snippet_metadata.google.cloud.tasks.v2beta3.json b/internal/generated/snippets/cloudtasks/apiv2beta3/snippet_metadata.google.cloud.tasks.v2beta3.json
index 3c4e1752249..069c3d9f796 100644
--- a/internal/generated/snippets/cloudtasks/apiv2beta3/snippet_metadata.google.cloud.tasks.v2beta3.json
+++ b/internal/generated/snippets/cloudtasks/apiv2beta3/snippet_metadata.google.cloud.tasks.v2beta3.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/cloudtasks/apiv2beta3",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/compute/apiv1/snippet_metadata.google.cloud.compute.v1.json b/internal/generated/snippets/compute/apiv1/snippet_metadata.google.cloud.compute.v1.json
index df773dd07ec..67c1229f3f7 100644
--- a/internal/generated/snippets/compute/apiv1/snippet_metadata.google.cloud.compute.v1.json
+++ b/internal/generated/snippets/compute/apiv1/snippet_metadata.google.cloud.compute.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/compute/apiv1",
-    "version": "1.10.0",
+    "version": "1.12.1",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CalculateIssueModelStats/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CalculateIssueModelStats/main.go
index f239d506373..bf97b285b17 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CalculateIssueModelStats/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CalculateIssueModelStats/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.CalculateIssueModelStatsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CalculateIssueModelStatsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CalculateIssueModelStatsRequest.
 	}
 	resp, err := c.CalculateIssueModelStats(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CalculateStats/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CalculateStats/main.go
index 20d4b55778e..38cfc57c0c7 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CalculateStats/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CalculateStats/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.CalculateStatsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CalculateStatsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CalculateStatsRequest.
 	}
 	resp, err := c.CalculateStats(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateAnalysis/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateAnalysis/main.go
index 315d4c37faf..c82d0563161 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateAnalysis/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateAnalysis/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.CreateAnalysisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateAnalysisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateAnalysisRequest.
 	}
 	op, err := c.CreateAnalysis(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateConversation/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateConversation/main.go
index b6985adb1f6..2177a45e6a6 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateConversation/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateConversation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.CreateConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateConversationRequest.
 	}
 	resp, err := c.CreateConversation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateIssueModel/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateIssueModel/main.go
index 7f354a2e3ce..e531cd11f46 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateIssueModel/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateIssueModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.CreateIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateIssueModelRequest.
 	}
 	op, err := c.CreateIssueModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreatePhraseMatcher/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreatePhraseMatcher/main.go
index fac1000125f..02ffcd42200 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreatePhraseMatcher/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreatePhraseMatcher/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.CreatePhraseMatcherRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreatePhraseMatcherRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreatePhraseMatcherRequest.
 	}
 	resp, err := c.CreatePhraseMatcher(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateView/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateView/main.go
index 84777f303c2..e39aa192bcc 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateView/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/CreateView/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.CreateViewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#CreateViewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#CreateViewRequest.
 	}
 	resp, err := c.CreateView(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteAnalysis/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteAnalysis/main.go
index 4ff1a650b23..4c2ce67eabe 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteAnalysis/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteAnalysis/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.DeleteAnalysisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeleteAnalysisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeleteAnalysisRequest.
 	}
 	err = c.DeleteAnalysis(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteConversation/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteConversation/main.go
index f37304bf843..eceeb1604c0 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteConversation/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteConversation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.DeleteConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeleteConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeleteConversationRequest.
 	}
 	err = c.DeleteConversation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteIssueModel/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteIssueModel/main.go
index 2846be86f22..1b9551c737d 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteIssueModel/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteIssueModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.DeleteIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeleteIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeleteIssueModelRequest.
 	}
 	op, err := c.DeleteIssueModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeletePhraseMatcher/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeletePhraseMatcher/main.go
index dae6cec7f98..7972863ccdc 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeletePhraseMatcher/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeletePhraseMatcher/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.DeletePhraseMatcherRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeletePhraseMatcherRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeletePhraseMatcherRequest.
 	}
 	err = c.DeletePhraseMatcher(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteView/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteView/main.go
index 45c679fad68..20c104f8afa 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteView/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeleteView/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.DeleteViewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeleteViewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeleteViewRequest.
 	}
 	err = c.DeleteView(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeployIssueModel/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeployIssueModel/main.go
index 6ba819bb142..395c4b6f9ba 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeployIssueModel/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/DeployIssueModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.DeployIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#DeployIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#DeployIssueModelRequest.
 	}
 	op, err := c.DeployIssueModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ExportInsightsData/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ExportInsightsData/main.go
index 6fd633e95b5..e4917c8dc7a 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ExportInsightsData/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ExportInsightsData/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.ExportInsightsDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ExportInsightsDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ExportInsightsDataRequest.
 	}
 	op, err := c.ExportInsightsData(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetAnalysis/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetAnalysis/main.go
index 7aeb637318b..f3a1b03f5d5 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetAnalysis/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetAnalysis/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.GetAnalysisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetAnalysisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetAnalysisRequest.
 	}
 	resp, err := c.GetAnalysis(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetConversation/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetConversation/main.go
index 9bc517a2f96..2465ea5ae8d 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetConversation/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetConversation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.GetConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetConversationRequest.
 	}
 	resp, err := c.GetConversation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetIssue/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetIssue/main.go
index 18ab7a80cbb..0decbf2f290 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetIssue/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetIssue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.GetIssueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetIssueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetIssueRequest.
 	}
 	resp, err := c.GetIssue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetIssueModel/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetIssueModel/main.go
index 43f7f0204c5..9915b553e67 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetIssueModel/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetIssueModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.GetIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetIssueModelRequest.
 	}
 	resp, err := c.GetIssueModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetPhraseMatcher/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetPhraseMatcher/main.go
index 3ae51a05b10..badabd02a62 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetPhraseMatcher/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetPhraseMatcher/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.GetPhraseMatcherRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetPhraseMatcherRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetPhraseMatcherRequest.
 	}
 	resp, err := c.GetPhraseMatcher(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetSettings/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetSettings/main.go
index 6eee70980b7..4568d1a4615 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetSettings/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetSettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.GetSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetSettingsRequest.
 	}
 	resp, err := c.GetSettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetView/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetView/main.go
index d0eecf8b360..e8e6d021f81 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetView/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/GetView/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.GetViewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#GetViewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#GetViewRequest.
 	}
 	resp, err := c.GetView(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListAnalyses/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListAnalyses/main.go
index 2558973c213..5ea3606e8bb 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListAnalyses/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListAnalyses/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 	"google.golang.org/api/iterator"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &contactcenterinsightspb.ListAnalysesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListAnalysesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListAnalysesRequest.
 	}
 	it := c.ListAnalyses(ctx, req)
 	for {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListConversations/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListConversations/main.go
index 12ceed0203e..67ba8474f7e 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListConversations/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListConversations/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 	"google.golang.org/api/iterator"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &contactcenterinsightspb.ListConversationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListConversationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListConversationsRequest.
 	}
 	it := c.ListConversations(ctx, req)
 	for {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListIssueModels/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListIssueModels/main.go
index 6aa7f993425..ddc311d4295 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListIssueModels/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListIssueModels/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.ListIssueModelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListIssueModelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListIssueModelsRequest.
 	}
 	resp, err := c.ListIssueModels(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListIssues/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListIssues/main.go
index 3325994679c..3139aa9ffa8 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListIssues/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListIssues/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.ListIssuesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListIssuesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListIssuesRequest.
 	}
 	resp, err := c.ListIssues(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListPhraseMatchers/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListPhraseMatchers/main.go
index c1e53cd6080..a128414282d 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListPhraseMatchers/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListPhraseMatchers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 	"google.golang.org/api/iterator"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &contactcenterinsightspb.ListPhraseMatchersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListPhraseMatchersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListPhraseMatchersRequest.
 	}
 	it := c.ListPhraseMatchers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListViews/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListViews/main.go
index 5fd50f224bc..f0c2d6a2e9c 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListViews/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/ListViews/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 	"google.golang.org/api/iterator"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &contactcenterinsightspb.ListViewsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#ListViewsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#ListViewsRequest.
 	}
 	it := c.ListViews(ctx, req)
 	for {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UndeployIssueModel/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UndeployIssueModel/main.go
index 5080b4269c5..4431d51874e 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UndeployIssueModel/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UndeployIssueModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.UndeployIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UndeployIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UndeployIssueModelRequest.
 	}
 	op, err := c.UndeployIssueModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateConversation/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateConversation/main.go
index 2aec3c85292..3af2f770e7a 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateConversation/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateConversation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.UpdateConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateConversationRequest.
 	}
 	resp, err := c.UpdateConversation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateIssue/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateIssue/main.go
index 7d8b7e532c2..4f1955234ac 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateIssue/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateIssue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.UpdateIssueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateIssueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateIssueRequest.
 	}
 	resp, err := c.UpdateIssue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateIssueModel/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateIssueModel/main.go
index c040f36b6fb..a821c416637 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateIssueModel/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateIssueModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.UpdateIssueModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateIssueModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateIssueModelRequest.
 	}
 	resp, err := c.UpdateIssueModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdatePhraseMatcher/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdatePhraseMatcher/main.go
index 894c60f6358..c400ef384bf 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdatePhraseMatcher/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdatePhraseMatcher/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.UpdatePhraseMatcherRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdatePhraseMatcherRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdatePhraseMatcherRequest.
 	}
 	resp, err := c.UpdatePhraseMatcher(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateSettings/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateSettings/main.go
index acde62c82e2..1a72b00e208 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateSettings/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateSettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.UpdateSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateSettingsRequest.
 	}
 	resp, err := c.UpdateSettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateView/main.go b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateView/main.go
index 76f9a692f83..ac5e970d011 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateView/main.go
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/Client/UpdateView/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	contactcenterinsights "cloud.google.com/go/contactcenterinsights/apiv1"
-
-	contactcenterinsightspb "google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1"
+	contactcenterinsightspb "cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &contactcenterinsightspb.UpdateViewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/contactcenterinsights/v1#UpdateViewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/contactcenterinsights/apiv1/contactcenterinsightspb#UpdateViewRequest.
 	}
 	resp, err := c.UpdateView(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/contactcenterinsights/apiv1/snippet_metadata.google.cloud.contactcenterinsights.v1.json b/internal/generated/snippets/contactcenterinsights/apiv1/snippet_metadata.google.cloud.contactcenterinsights.v1.json
index 4b436d88fda..d9fdf76b2cd 100644
--- a/internal/generated/snippets/contactcenterinsights/apiv1/snippet_metadata.google.cloud.contactcenterinsights.v1.json
+++ b/internal/generated/snippets/contactcenterinsights/apiv1/snippet_metadata.google.cloud.contactcenterinsights.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/contactcenterinsights/apiv1",
-    "version": "1.2.3",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -463,7 +463,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -509,7 +509,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -554,7 +554,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -599,7 +599,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -645,7 +645,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -691,7 +691,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -737,7 +737,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -783,7 +783,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -829,7 +829,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -875,7 +875,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -967,7 +967,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1013,7 +1013,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1059,7 +1059,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1105,7 +1105,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1151,7 +1151,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1197,7 +1197,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1243,7 +1243,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1335,7 +1335,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1381,7 +1381,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1427,7 +1427,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1473,7 +1473,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1519,7 +1519,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1565,7 +1565,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1611,7 +1611,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1657,7 +1657,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1703,7 +1703,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CancelOperation/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CancelOperation/main.go
index 0aa36086e61..a48135950c8 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CancelOperation/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CancelOperation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.CancelOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CancelOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CancelOperationRequest.
 	}
 	err = c.CancelOperation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CompleteIPRotation/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CompleteIPRotation/main.go
index 1279be5fd09..07222dcc398 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CompleteIPRotation/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CompleteIPRotation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.CompleteIPRotationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CompleteIPRotationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CompleteIPRotationRequest.
 	}
 	resp, err := c.CompleteIPRotation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CompleteNodePoolUpgrade/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CompleteNodePoolUpgrade/main.go
index a76a1c21053..e003af60b60 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CompleteNodePoolUpgrade/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CompleteNodePoolUpgrade/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.CompleteNodePoolUpgradeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CompleteNodePoolUpgradeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CompleteNodePoolUpgradeRequest.
 	}
 	err = c.CompleteNodePoolUpgrade(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CreateCluster/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CreateCluster/main.go
index 1c25cc6c6e7..d8379de9993 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CreateCluster/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CreateCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.CreateClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CreateClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CreateClusterRequest.
 	}
 	resp, err := c.CreateCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CreateNodePool/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CreateNodePool/main.go
index 14bc7c452cd..f3488a1ab3c 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/CreateNodePool/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/CreateNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.CreateNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#CreateNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#CreateNodePoolRequest.
 	}
 	resp, err := c.CreateNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/DeleteCluster/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/DeleteCluster/main.go
index 63840a58ff0..f7913f0fcb4 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/DeleteCluster/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/DeleteCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.DeleteClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#DeleteClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#DeleteClusterRequest.
 	}
 	resp, err := c.DeleteCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/DeleteNodePool/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/DeleteNodePool/main.go
index 2ff3bedbfdf..705469bc749 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/DeleteNodePool/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/DeleteNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.DeleteNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#DeleteNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#DeleteNodePoolRequest.
 	}
 	resp, err := c.DeleteNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetCluster/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetCluster/main.go
index b8672d16bd0..69cf1bf6dac 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetCluster/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.GetClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetClusterRequest.
 	}
 	resp, err := c.GetCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetJSONWebKeys/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetJSONWebKeys/main.go
index 5f6aae9b5ca..6a5f9926f22 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetJSONWebKeys/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetJSONWebKeys/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.GetJSONWebKeysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetJSONWebKeysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetJSONWebKeysRequest.
 	}
 	resp, err := c.GetJSONWebKeys(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetNodePool/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetNodePool/main.go
index 7e35376ff0a..619c9030825 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetNodePool/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.GetNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetNodePoolRequest.
 	}
 	resp, err := c.GetNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetOperation/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetOperation/main.go
index 338ddc7cd72..0e9b6ceff51 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetOperation/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetOperation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.GetOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetOperationRequest.
 	}
 	resp, err := c.GetOperation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetServerConfig/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetServerConfig/main.go
index 0595416ad34..a53cf165a2a 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetServerConfig/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/GetServerConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.GetServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#GetServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#GetServerConfigRequest.
 	}
 	resp, err := c.GetServerConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListClusters/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListClusters/main.go
index 77b05b49f51..bdd42b32013 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListClusters/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListClusters/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.ListClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListClustersRequest.
 	}
 	resp, err := c.ListClusters(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListNodePools/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListNodePools/main.go
index a2df954ae0f..9c723815b6e 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListNodePools/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListNodePools/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.ListNodePoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListNodePoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListNodePoolsRequest.
 	}
 	resp, err := c.ListNodePools(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListOperations/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListOperations/main.go
index 3491e81e9f0..7bb20b4cb04 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListOperations/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListOperations/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.ListOperationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListOperationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListOperationsRequest.
 	}
 	resp, err := c.ListOperations(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListUsableSubnetworks/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListUsableSubnetworks/main.go
index a706f15673d..b22fbc1a119 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListUsableSubnetworks/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/ListUsableSubnetworks/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 	"google.golang.org/api/iterator"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &containerpb.ListUsableSubnetworksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#ListUsableSubnetworksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#ListUsableSubnetworksRequest.
 	}
 	it := c.ListUsableSubnetworks(ctx, req)
 	for {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/RollbackNodePoolUpgrade/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/RollbackNodePoolUpgrade/main.go
index 17645cf514d..5af46294889 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/RollbackNodePoolUpgrade/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/RollbackNodePoolUpgrade/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.RollbackNodePoolUpgradeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#RollbackNodePoolUpgradeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#RollbackNodePoolUpgradeRequest.
 	}
 	resp, err := c.RollbackNodePoolUpgrade(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetAddonsConfig/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetAddonsConfig/main.go
index 0408a395bf6..73e76c21d69 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetAddonsConfig/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetAddonsConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetAddonsConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetAddonsConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetAddonsConfigRequest.
 	}
 	resp, err := c.SetAddonsConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLabels/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLabels/main.go
index 9c9ba7a1571..34f8bb3be8d 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLabels/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLabels/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetLabelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetLabelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetLabelsRequest.
 	}
 	resp, err := c.SetLabels(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLegacyAbac/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLegacyAbac/main.go
index b39694e6e7b..c6eaf65183d 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLegacyAbac/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLegacyAbac/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetLegacyAbacRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetLegacyAbacRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetLegacyAbacRequest.
 	}
 	resp, err := c.SetLegacyAbac(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLocations/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLocations/main.go
index 33f9b54c857..4f19151a442 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLocations/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLocations/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetLocationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetLocationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetLocationsRequest.
 	}
 	resp, err := c.SetLocations(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLoggingService/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLoggingService/main.go
index 81e7ce55c52..fd33e6992d0 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLoggingService/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetLoggingService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetLoggingServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetLoggingServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetLoggingServiceRequest.
 	}
 	resp, err := c.SetLoggingService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMaintenancePolicy/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMaintenancePolicy/main.go
index 409aefe0e32..355db866e26 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMaintenancePolicy/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMaintenancePolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetMaintenancePolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetMaintenancePolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetMaintenancePolicyRequest.
 	}
 	resp, err := c.SetMaintenancePolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMasterAuth/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMasterAuth/main.go
index 2e80cc90dd9..8f33268a685 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMasterAuth/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMasterAuth/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetMasterAuthRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetMasterAuthRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetMasterAuthRequest.
 	}
 	resp, err := c.SetMasterAuth(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMonitoringService/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMonitoringService/main.go
index 55b18617929..f902f904599 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMonitoringService/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetMonitoringService/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetMonitoringServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetMonitoringServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetMonitoringServiceRequest.
 	}
 	resp, err := c.SetMonitoringService(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNetworkPolicy/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNetworkPolicy/main.go
index 23f575946cc..931b4ce29fc 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNetworkPolicy/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNetworkPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetNetworkPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetNetworkPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetNetworkPolicyRequest.
 	}
 	resp, err := c.SetNetworkPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolAutoscaling/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolAutoscaling/main.go
index a8831444294..e9b54b810e4 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolAutoscaling/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolAutoscaling/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetNodePoolAutoscalingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetNodePoolAutoscalingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetNodePoolAutoscalingRequest.
 	}
 	resp, err := c.SetNodePoolAutoscaling(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolManagement/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolManagement/main.go
index a08e8f8df9e..b89582d3ad5 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolManagement/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolManagement/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetNodePoolManagementRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetNodePoolManagementRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetNodePoolManagementRequest.
 	}
 	resp, err := c.SetNodePoolManagement(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolSize/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolSize/main.go
index 4d490e370e1..b593db9bd9b 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolSize/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/SetNodePoolSize/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.SetNodePoolSizeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#SetNodePoolSizeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#SetNodePoolSizeRequest.
 	}
 	resp, err := c.SetNodePoolSize(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/StartIPRotation/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/StartIPRotation/main.go
index b6943296c54..375f0ca6613 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/StartIPRotation/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/StartIPRotation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.StartIPRotationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#StartIPRotationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#StartIPRotationRequest.
 	}
 	resp, err := c.StartIPRotation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateCluster/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateCluster/main.go
index 54e53bcc105..e28722b551e 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateCluster/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.UpdateClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#UpdateClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#UpdateClusterRequest.
 	}
 	resp, err := c.UpdateCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateMaster/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateMaster/main.go
index de9a71d296f..1ffbdfddcf9 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateMaster/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateMaster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.UpdateMasterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#UpdateMasterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#UpdateMasterRequest.
 	}
 	resp, err := c.UpdateMaster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateNodePool/main.go b/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateNodePool/main.go
index 5044a35ab74..b09594d0502 100644
--- a/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateNodePool/main.go
+++ b/internal/generated/snippets/container/apiv1/ClusterManagerClient/UpdateNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	container "cloud.google.com/go/container/apiv1"
-
-	containerpb "google.golang.org/genproto/googleapis/container/v1"
+	containerpb "cloud.google.com/go/container/apiv1/containerpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &containerpb.UpdateNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/container/v1#UpdateNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/container/apiv1/containerpb#UpdateNodePoolRequest.
 	}
 	resp, err := c.UpdateNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/container/apiv1/snippet_metadata.google.container.v1.json b/internal/generated/snippets/container/apiv1/snippet_metadata.google.container.v1.json
index a749057892c..9413868e676 100644
--- a/internal/generated/snippets/container/apiv1/snippet_metadata.google.container.v1.json
+++ b/internal/generated/snippets/container/apiv1/snippet_metadata.google.container.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/container/apiv1",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "language": "GO",
     "apis": [
       {
@@ -51,7 +51,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -142,7 +142,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -188,7 +188,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -234,7 +234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -280,7 +280,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -326,7 +326,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -372,7 +372,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -464,7 +464,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -510,7 +510,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -648,7 +648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -694,7 +694,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -740,7 +740,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -786,7 +786,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -832,7 +832,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -878,7 +878,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -924,7 +924,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -970,7 +970,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1016,7 +1016,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1062,7 +1062,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1108,7 +1108,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1154,7 +1154,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1200,7 +1200,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1246,7 +1246,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1292,7 +1292,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1338,7 +1338,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1384,7 +1384,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1430,7 +1430,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1476,7 +1476,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1522,7 +1522,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/CreateEntry/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/CreateEntry/main.go
index e9feb2ada28..ec1c8892051 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/CreateEntry/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/CreateEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.CreateEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateEntryRequest.
 	}
 	resp, err := c.CreateEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/CreateEntryGroup/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/CreateEntryGroup/main.go
index 31611de9cd2..70f92e97d17 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/CreateEntryGroup/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/CreateEntryGroup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.CreateEntryGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateEntryGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateEntryGroupRequest.
 	}
 	resp, err := c.CreateEntryGroup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/CreateTag/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/CreateTag/main.go
index 412ffd1c6a0..e84a9c0ede4 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/CreateTag/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/CreateTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.CreateTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateTagRequest.
 	}
 	resp, err := c.CreateTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/CreateTagTemplate/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/CreateTagTemplate/main.go
index 6aad4222258..071ed0c227c 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/CreateTagTemplate/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/CreateTagTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.CreateTagTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateTagTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateTagTemplateRequest.
 	}
 	resp, err := c.CreateTagTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/CreateTagTemplateField/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/CreateTagTemplateField/main.go
index d87e2b852ff..f2dd4707e24 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/CreateTagTemplateField/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/CreateTagTemplateField/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.CreateTagTemplateFieldRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateTagTemplateFieldRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateTagTemplateFieldRequest.
 	}
 	resp, err := c.CreateTagTemplateField(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteEntry/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteEntry/main.go
index 7d296c47757..df17e8496a6 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteEntry/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.DeleteEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteEntryRequest.
 	}
 	err = c.DeleteEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteEntryGroup/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteEntryGroup/main.go
index cb9e71df7ef..8bd7265658f 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteEntryGroup/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteEntryGroup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.DeleteEntryGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteEntryGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteEntryGroupRequest.
 	}
 	err = c.DeleteEntryGroup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTag/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTag/main.go
index 7e14b7da52e..fc860c91325 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTag/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.DeleteTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteTagRequest.
 	}
 	err = c.DeleteTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTagTemplate/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTagTemplate/main.go
index 582fa3320d4..650c2afc5bc 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTagTemplate/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTagTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.DeleteTagTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteTagTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteTagTemplateRequest.
 	}
 	err = c.DeleteTagTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTagTemplateField/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTagTemplateField/main.go
index 4551d570fe5..ff787a44829 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTagTemplateField/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/DeleteTagTemplateField/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.DeleteTagTemplateFieldRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteTagTemplateFieldRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteTagTemplateFieldRequest.
 	}
 	err = c.DeleteTagTemplateField(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/GetEntry/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/GetEntry/main.go
index 10f373779b2..dbaf5b49b6c 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/GetEntry/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/GetEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.GetEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetEntryRequest.
 	}
 	resp, err := c.GetEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/GetEntryGroup/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/GetEntryGroup/main.go
index 1f30c6faa87..a43e49c4468 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/GetEntryGroup/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/GetEntryGroup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.GetEntryGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetEntryGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetEntryGroupRequest.
 	}
 	resp, err := c.GetEntryGroup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/GetTagTemplate/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/GetTagTemplate/main.go
index ea3161a5e6f..ce0cb404a4c 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/GetTagTemplate/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/GetTagTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.GetTagTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetTagTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetTagTemplateRequest.
 	}
 	resp, err := c.GetTagTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/ListEntries/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/ListEntries/main.go
index ca85f8e8f68..981172f476c 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/ListEntries/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/ListEntries/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	"google.golang.org/api/iterator"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datacatalogpb.ListEntriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListEntriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListEntriesRequest.
 	}
 	it := c.ListEntries(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/ListEntryGroups/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/ListEntryGroups/main.go
index 8c59a5ca5af..dc9ee1bfd7b 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/ListEntryGroups/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/ListEntryGroups/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	"google.golang.org/api/iterator"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datacatalogpb.ListEntryGroupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListEntryGroupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListEntryGroupsRequest.
 	}
 	it := c.ListEntryGroups(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/ListTags/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/ListTags/main.go
index 8d7b334ddd7..18de5662428 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/ListTags/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/ListTags/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	"google.golang.org/api/iterator"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datacatalogpb.ListTagsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListTagsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListTagsRequest.
 	}
 	it := c.ListTags(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/LookupEntry/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/LookupEntry/main.go
index 15bf3fc9e5f..2065cb76573 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/LookupEntry/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/LookupEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.LookupEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#LookupEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#LookupEntryRequest.
 	}
 	resp, err := c.LookupEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/ModifyEntryContacts/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/ModifyEntryContacts/main.go
index 8502a9737ff..5d823589c75 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/ModifyEntryContacts/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/ModifyEntryContacts/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.ModifyEntryContactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ModifyEntryContactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ModifyEntryContactsRequest.
 	}
 	resp, err := c.ModifyEntryContacts(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/ModifyEntryOverview/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/ModifyEntryOverview/main.go
index da5d0d080f1..040887eca44 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/ModifyEntryOverview/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/ModifyEntryOverview/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.ModifyEntryOverviewRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ModifyEntryOverviewRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ModifyEntryOverviewRequest.
 	}
 	resp, err := c.ModifyEntryOverview(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/RenameTagTemplateField/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/RenameTagTemplateField/main.go
index bf9a1df5867..ff13edd07cf 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/RenameTagTemplateField/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/RenameTagTemplateField/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.RenameTagTemplateFieldRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#RenameTagTemplateFieldRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#RenameTagTemplateFieldRequest.
 	}
 	resp, err := c.RenameTagTemplateField(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/RenameTagTemplateFieldEnumValue/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/RenameTagTemplateFieldEnumValue/main.go
index fde95e73b3a..f02e590bbad 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/RenameTagTemplateFieldEnumValue/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/RenameTagTemplateFieldEnumValue/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.RenameTagTemplateFieldEnumValueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#RenameTagTemplateFieldEnumValueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#RenameTagTemplateFieldEnumValueRequest.
 	}
 	resp, err := c.RenameTagTemplateFieldEnumValue(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/SearchCatalog/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/SearchCatalog/main.go
index 70776832497..6fb56128be9 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/SearchCatalog/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/SearchCatalog/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	"google.golang.org/api/iterator"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datacatalogpb.SearchCatalogRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#SearchCatalogRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#SearchCatalogRequest.
 	}
 	it := c.SearchCatalog(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/StarEntry/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/StarEntry/main.go
index 987c9248d3c..ed05891bee9 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/StarEntry/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/StarEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.StarEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#StarEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#StarEntryRequest.
 	}
 	resp, err := c.StarEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/UnstarEntry/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/UnstarEntry/main.go
index 9c4e7fced78..0a9c4aca4ca 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/UnstarEntry/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/UnstarEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.UnstarEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UnstarEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UnstarEntryRequest.
 	}
 	resp, err := c.UnstarEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateEntry/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateEntry/main.go
index e2de63d2867..40e5c0daa4e 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateEntry/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateEntry/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.UpdateEntryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateEntryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateEntryRequest.
 	}
 	resp, err := c.UpdateEntry(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateEntryGroup/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateEntryGroup/main.go
index 24744625d20..18d34bd8066 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateEntryGroup/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateEntryGroup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.UpdateEntryGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateEntryGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateEntryGroupRequest.
 	}
 	resp, err := c.UpdateEntryGroup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTag/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTag/main.go
index 60a2fd7ddf0..8591533889d 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTag/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.UpdateTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateTagRequest.
 	}
 	resp, err := c.UpdateTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTagTemplate/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTagTemplate/main.go
index 8227878bd0c..2dd9dbca327 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTagTemplate/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTagTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.UpdateTagTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateTagTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateTagTemplateRequest.
 	}
 	resp, err := c.UpdateTagTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTagTemplateField/main.go b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTagTemplateField/main.go
index ed3ddcac1ae..b64a0223f2a 100644
--- a/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTagTemplateField/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/Client/UpdateTagTemplateField/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.UpdateTagTemplateFieldRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateTagTemplateFieldRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateTagTemplateFieldRequest.
 	}
 	resp, err := c.UpdateTagTemplateField(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/CreatePolicyTag/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/CreatePolicyTag/main.go
index 5414ae6ef8b..80b268fddd0 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/CreatePolicyTag/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/CreatePolicyTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.CreatePolicyTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreatePolicyTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreatePolicyTagRequest.
 	}
 	resp, err := c.CreatePolicyTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/CreateTaxonomy/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/CreateTaxonomy/main.go
index 4942e4209e9..0a6a121481a 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/CreateTaxonomy/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/CreateTaxonomy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.CreateTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#CreateTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#CreateTaxonomyRequest.
 	}
 	resp, err := c.CreateTaxonomy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/DeletePolicyTag/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/DeletePolicyTag/main.go
index 70b11c326fe..7fd213c0bbb 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/DeletePolicyTag/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/DeletePolicyTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.DeletePolicyTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeletePolicyTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeletePolicyTagRequest.
 	}
 	err = c.DeletePolicyTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/DeleteTaxonomy/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/DeleteTaxonomy/main.go
index cf61393e897..92dc7a90244 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/DeleteTaxonomy/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/DeleteTaxonomy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.DeleteTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#DeleteTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#DeleteTaxonomyRequest.
 	}
 	err = c.DeleteTaxonomy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/GetPolicyTag/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/GetPolicyTag/main.go
index e4363512d6b..3314b8af19c 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/GetPolicyTag/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/GetPolicyTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.GetPolicyTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetPolicyTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetPolicyTagRequest.
 	}
 	resp, err := c.GetPolicyTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/GetTaxonomy/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/GetTaxonomy/main.go
index 35074209832..afe47bf11ff 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/GetTaxonomy/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/GetTaxonomy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.GetTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#GetTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#GetTaxonomyRequest.
 	}
 	resp, err := c.GetTaxonomy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/ListPolicyTags/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/ListPolicyTags/main.go
index 06b51652183..4acca7b2fd6 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/ListPolicyTags/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/ListPolicyTags/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	"google.golang.org/api/iterator"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datacatalogpb.ListPolicyTagsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListPolicyTagsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListPolicyTagsRequest.
 	}
 	it := c.ListPolicyTags(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/ListTaxonomies/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/ListTaxonomies/main.go
index 12dc3dc23be..6b6b2e26ae8 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/ListTaxonomies/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/ListTaxonomies/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 	"google.golang.org/api/iterator"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datacatalogpb.ListTaxonomiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ListTaxonomiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ListTaxonomiesRequest.
 	}
 	it := c.ListTaxonomies(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/UpdatePolicyTag/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/UpdatePolicyTag/main.go
index 3d4b8696f40..e600f91eeec 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/UpdatePolicyTag/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/UpdatePolicyTag/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.UpdatePolicyTagRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdatePolicyTagRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdatePolicyTagRequest.
 	}
 	resp, err := c.UpdatePolicyTag(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/UpdateTaxonomy/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/UpdateTaxonomy/main.go
index 24dd8866b9d..bc7dea5a800 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/UpdateTaxonomy/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerClient/UpdateTaxonomy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.UpdateTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#UpdateTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#UpdateTaxonomyRequest.
 	}
 	resp, err := c.UpdateTaxonomy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ExportTaxonomies/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ExportTaxonomies/main.go
index bd7f848c3e9..74da9ad218b 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ExportTaxonomies/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ExportTaxonomies/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.ExportTaxonomiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ExportTaxonomiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ExportTaxonomiesRequest.
 	}
 	resp, err := c.ExportTaxonomies(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ImportTaxonomies/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ImportTaxonomies/main.go
index 930d0fbd488..1eed37faddc 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ImportTaxonomies/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ImportTaxonomies/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.ImportTaxonomiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ImportTaxonomiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ImportTaxonomiesRequest.
 	}
 	resp, err := c.ImportTaxonomies(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ReplaceTaxonomy/main.go b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ReplaceTaxonomy/main.go
index d8c5cb9d558..03214932b3a 100644
--- a/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ReplaceTaxonomy/main.go
+++ b/internal/generated/snippets/datacatalog/apiv1/PolicyTagManagerSerializationClient/ReplaceTaxonomy/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	datacatalog "cloud.google.com/go/datacatalog/apiv1"
-	datacatalogpb "google.golang.org/genproto/googleapis/cloud/datacatalog/v1"
+	datacatalogpb "cloud.google.com/go/datacatalog/apiv1/datacatalogpb"
 )
 
 func main() {
@@ -40,7 +40,7 @@ func main() {
 
 	req := &datacatalogpb.ReplaceTaxonomyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datacatalog/v1#ReplaceTaxonomyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datacatalog/apiv1/datacatalogpb#ReplaceTaxonomyRequest.
 	}
 	resp, err := c.ReplaceTaxonomy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datacatalog/apiv1/snippet_metadata.google.cloud.datacatalog.v1.json b/internal/generated/snippets/datacatalog/apiv1/snippet_metadata.google.cloud.datacatalog.v1.json
index 4c47b6b12c2..4ccd130a04f 100644
--- a/internal/generated/snippets/datacatalog/apiv1/snippet_metadata.google.cloud.datacatalog.v1.json
+++ b/internal/generated/snippets/datacatalog/apiv1/snippet_metadata.google.cloud.datacatalog.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/datacatalog/apiv1",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -326,7 +326,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -371,7 +371,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -416,7 +416,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -461,7 +461,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -507,7 +507,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -553,7 +553,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -645,7 +645,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -691,7 +691,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -737,7 +737,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -783,7 +783,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -829,7 +829,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -875,7 +875,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -921,7 +921,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -967,7 +967,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1013,7 +1013,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1059,7 +1059,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1151,7 +1151,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1243,7 +1243,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1289,7 +1289,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1335,7 +1335,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1381,7 +1381,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1427,7 +1427,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1473,7 +1473,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1519,7 +1519,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1565,7 +1565,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1610,7 +1610,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -1655,7 +1655,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -1747,7 +1747,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1793,7 +1793,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1839,7 +1839,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1885,7 +1885,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2023,7 +2023,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2069,7 +2069,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/datacatalog/apiv1beta1/snippet_metadata.google.cloud.datacatalog.v1beta1.json b/internal/generated/snippets/datacatalog/apiv1beta1/snippet_metadata.google.cloud.datacatalog.v1beta1.json
index cebd40e4818..eb909e2e2b2 100644
--- a/internal/generated/snippets/datacatalog/apiv1beta1/snippet_metadata.google.cloud.datacatalog.v1beta1.json
+++ b/internal/generated/snippets/datacatalog/apiv1beta1/snippet_metadata.google.cloud.datacatalog.v1beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/datacatalog/apiv1beta1",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/dataform/apiv1alpha2/snippet_metadata.google.cloud.dataform.v1alpha2.json b/internal/generated/snippets/dataform/apiv1alpha2/snippet_metadata.google.cloud.dataform.v1alpha2.json
index 00d5f87015d..2720da3f4a0 100644
--- a/internal/generated/snippets/dataform/apiv1alpha2/snippet_metadata.google.cloud.dataform.v1alpha2.json
+++ b/internal/generated/snippets/dataform/apiv1alpha2/snippet_metadata.google.cloud.dataform.v1alpha2.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dataform/apiv1alpha2",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/dataform/apiv1beta1/snippet_metadata.google.cloud.dataform.v1beta1.json b/internal/generated/snippets/dataform/apiv1beta1/snippet_metadata.google.cloud.dataform.v1beta1.json
index 458952b01c3..0686c9acbcb 100644
--- a/internal/generated/snippets/dataform/apiv1beta1/snippet_metadata.google.cloud.dataform.v1beta1.json
+++ b/internal/generated/snippets/dataform/apiv1beta1/snippet_metadata.google.cloud.dataform.v1beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dataform/apiv1beta1",
-    "version": "0.4.0",
+    "version": "0.5.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/datafusion/apiv1/Client/CreateInstance/main.go b/internal/generated/snippets/datafusion/apiv1/Client/CreateInstance/main.go
index d845324c101..1c0a0fb8310 100644
--- a/internal/generated/snippets/datafusion/apiv1/Client/CreateInstance/main.go
+++ b/internal/generated/snippets/datafusion/apiv1/Client/CreateInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datafusion "cloud.google.com/go/datafusion/apiv1"
-
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datafusionpb.CreateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#CreateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#CreateInstanceRequest.
 	}
 	op, err := c.CreateInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datafusion/apiv1/Client/DeleteInstance/main.go b/internal/generated/snippets/datafusion/apiv1/Client/DeleteInstance/main.go
index 263f47b32da..ac766c455d0 100644
--- a/internal/generated/snippets/datafusion/apiv1/Client/DeleteInstance/main.go
+++ b/internal/generated/snippets/datafusion/apiv1/Client/DeleteInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datafusion "cloud.google.com/go/datafusion/apiv1"
-
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datafusionpb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datafusion/apiv1/Client/GetInstance/main.go b/internal/generated/snippets/datafusion/apiv1/Client/GetInstance/main.go
index fec6f3c7899..9134a6975ac 100644
--- a/internal/generated/snippets/datafusion/apiv1/Client/GetInstance/main.go
+++ b/internal/generated/snippets/datafusion/apiv1/Client/GetInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datafusion "cloud.google.com/go/datafusion/apiv1"
-
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datafusionpb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datafusion/apiv1/Client/ListAvailableVersions/main.go b/internal/generated/snippets/datafusion/apiv1/Client/ListAvailableVersions/main.go
index 7b7a973f2f6..03934f61b48 100644
--- a/internal/generated/snippets/datafusion/apiv1/Client/ListAvailableVersions/main.go
+++ b/internal/generated/snippets/datafusion/apiv1/Client/ListAvailableVersions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datafusion "cloud.google.com/go/datafusion/apiv1"
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 	"google.golang.org/api/iterator"
-
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datafusionpb.ListAvailableVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#ListAvailableVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#ListAvailableVersionsRequest.
 	}
 	it := c.ListAvailableVersions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datafusion/apiv1/Client/ListInstances/main.go b/internal/generated/snippets/datafusion/apiv1/Client/ListInstances/main.go
index b0f046301f9..776369070b1 100644
--- a/internal/generated/snippets/datafusion/apiv1/Client/ListInstances/main.go
+++ b/internal/generated/snippets/datafusion/apiv1/Client/ListInstances/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datafusion "cloud.google.com/go/datafusion/apiv1"
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 	"google.golang.org/api/iterator"
-
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datafusionpb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datafusion/apiv1/Client/RestartInstance/main.go b/internal/generated/snippets/datafusion/apiv1/Client/RestartInstance/main.go
index ab64159df6e..e22b08567ba 100644
--- a/internal/generated/snippets/datafusion/apiv1/Client/RestartInstance/main.go
+++ b/internal/generated/snippets/datafusion/apiv1/Client/RestartInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datafusion "cloud.google.com/go/datafusion/apiv1"
-
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datafusionpb.RestartInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#RestartInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#RestartInstanceRequest.
 	}
 	op, err := c.RestartInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datafusion/apiv1/Client/UpdateInstance/main.go b/internal/generated/snippets/datafusion/apiv1/Client/UpdateInstance/main.go
index 959806dcdc1..d4a0a19227c 100644
--- a/internal/generated/snippets/datafusion/apiv1/Client/UpdateInstance/main.go
+++ b/internal/generated/snippets/datafusion/apiv1/Client/UpdateInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datafusion "cloud.google.com/go/datafusion/apiv1"
-
-	datafusionpb "google.golang.org/genproto/googleapis/cloud/datafusion/v1"
+	datafusionpb "cloud.google.com/go/datafusion/apiv1/datafusionpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datafusionpb.UpdateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datafusion/v1#UpdateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datafusion/apiv1/datafusionpb#UpdateInstanceRequest.
 	}
 	op, err := c.UpdateInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datafusion/apiv1/snippet_metadata.google.cloud.datafusion.v1.json b/internal/generated/snippets/datafusion/apiv1/snippet_metadata.google.cloud.datafusion.v1.json
index ce7b7dadf94..76ad8cbd038 100644
--- a/internal/generated/snippets/datafusion/apiv1/snippet_metadata.google.cloud.datafusion.v1.json
+++ b/internal/generated/snippets/datafusion/apiv1/snippet_metadata.google.cloud.datafusion.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/datafusion/apiv1",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CancelJob/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CancelJob/main.go
index 8ea29a4dac7..6e680014fd9 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/CancelJob/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/CancelJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CancelJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CancelJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CancelJobRequest.
 	}
 	err = c.CancelJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateAsset/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateAsset/main.go
index e363b72c9e1..2e9f287f898 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/CreateAsset/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateAsset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CreateAssetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateAssetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateAssetRequest.
 	}
 	op, err := c.CreateAsset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateEnvironment/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateEnvironment/main.go
index e4ce511781c..3aa679eb798 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/CreateEnvironment/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CreateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateEnvironmentRequest.
 	}
 	op, err := c.CreateEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateLake/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateLake/main.go
index ec0b8186d96..4f6387abd56 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/CreateLake/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateLake/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CreateLakeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateLakeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateLakeRequest.
 	}
 	op, err := c.CreateLake(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateTask/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateTask/main.go
index 1d07727aad9..455960171a2 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/CreateTask/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CreateTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateTaskRequest.
 	}
 	op, err := c.CreateTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/CreateZone/main.go b/internal/generated/snippets/dataplex/apiv1/Client/CreateZone/main.go
index b48acd9a14d..5163791f516 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/CreateZone/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/CreateZone/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CreateZoneRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateZoneRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateZoneRequest.
 	}
 	op, err := c.CreateZone(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteAsset/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteAsset/main.go
index bb890f2c413..af8dd4827ca 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/DeleteAsset/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteAsset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.DeleteAssetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteAssetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteAssetRequest.
 	}
 	op, err := c.DeleteAsset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteEnvironment/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteEnvironment/main.go
index 3a27e1eaa9f..f2b27ef7759 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/DeleteEnvironment/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.DeleteEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteEnvironmentRequest.
 	}
 	op, err := c.DeleteEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteLake/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteLake/main.go
index 24b366864df..d583ebb0799 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/DeleteLake/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteLake/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.DeleteLakeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteLakeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteLakeRequest.
 	}
 	op, err := c.DeleteLake(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteTask/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteTask/main.go
index 8ffc17c72ef..e187af657a9 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/DeleteTask/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.DeleteTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteTaskRequest.
 	}
 	op, err := c.DeleteTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/DeleteZone/main.go b/internal/generated/snippets/dataplex/apiv1/Client/DeleteZone/main.go
index 22f5101cdae..ad698f935c0 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/DeleteZone/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/DeleteZone/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.DeleteZoneRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteZoneRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteZoneRequest.
 	}
 	op, err := c.DeleteZone(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetAsset/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetAsset/main.go
index f24d1eed1ee..6af46f308b3 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/GetAsset/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/GetAsset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetAssetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetAssetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetAssetRequest.
 	}
 	resp, err := c.GetAsset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetEnvironment/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetEnvironment/main.go
index 47be1f2cbe8..5c463cc8a8e 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/GetEnvironment/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/GetEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetJob/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetJob/main.go
index 53b912dffca..a3c4a3e82ea 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/GetJob/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/GetJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetLake/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetLake/main.go
index 43e170cda0a..b9b5d86d757 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/GetLake/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/GetLake/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetLakeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetLakeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetLakeRequest.
 	}
 	resp, err := c.GetLake(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetTask/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetTask/main.go
index a58468d89f9..dd7728b88e4 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/GetTask/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/GetTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetTaskRequest.
 	}
 	resp, err := c.GetTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/GetZone/main.go b/internal/generated/snippets/dataplex/apiv1/Client/GetZone/main.go
index 2e8879eff9d..8c5561ceb71 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/GetZone/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/GetZone/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetZoneRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetZoneRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetZoneRequest.
 	}
 	resp, err := c.GetZone(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListAssetActions/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListAssetActions/main.go
index 9f033dc75f3..007a23fda44 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListAssetActions/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListAssetActions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListAssetActionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListAssetActionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListAssetActionsRequest.
 	}
 	it := c.ListAssetActions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListAssets/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListAssets/main.go
index de55d6710c4..de05011f487 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListAssets/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListAssets/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListAssetsRequest.
 	}
 	it := c.ListAssets(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListEnvironments/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListEnvironments/main.go
index 3c5ea9a2dc7..875e8d03d95 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListEnvironments/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListEnvironments/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListEnvironmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListEnvironmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListEnvironmentsRequest.
 	}
 	it := c.ListEnvironments(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListJobs/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListJobs/main.go
index 42805dcbfba..6b746e2849e 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListJobs/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListJobs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListLakeActions/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListLakeActions/main.go
index 4081c8c43b1..36842211aaa 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListLakeActions/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListLakeActions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListLakeActionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListLakeActionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListLakeActionsRequest.
 	}
 	it := c.ListLakeActions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListLakes/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListLakes/main.go
index e23523fc60f..98fec3e896f 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListLakes/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListLakes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListLakesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListLakesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListLakesRequest.
 	}
 	it := c.ListLakes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListSessions/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListSessions/main.go
index 9061ece9a5b..78370fb8f28 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListSessions/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListSessions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListSessionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListSessionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListSessionsRequest.
 	}
 	it := c.ListSessions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListTasks/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListTasks/main.go
index e11cb0b1442..9c8e51c430d 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListTasks/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListTasks/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListTasksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListTasksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListTasksRequest.
 	}
 	it := c.ListTasks(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListZoneActions/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListZoneActions/main.go
index e3d5fa9745a..83cae58b6dc 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListZoneActions/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListZoneActions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListZoneActionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListZoneActionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListZoneActionsRequest.
 	}
 	it := c.ListZoneActions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/ListZones/main.go b/internal/generated/snippets/dataplex/apiv1/Client/ListZones/main.go
index 29c96401b4e..5a9609f3dbb 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/ListZones/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/ListZones/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListZonesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListZonesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListZonesRequest.
 	}
 	it := c.ListZones(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateAsset/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateAsset/main.go
index 021b8e142ca..c2061ecd783 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/UpdateAsset/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateAsset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.UpdateAssetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateAssetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateAssetRequest.
 	}
 	op, err := c.UpdateAsset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateEnvironment/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateEnvironment/main.go
index 77b3e2a1aec..e837c63cd05 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/UpdateEnvironment/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.UpdateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateEnvironmentRequest.
 	}
 	op, err := c.UpdateEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateLake/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateLake/main.go
index e5762a4f08a..1cc9616d9b9 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/UpdateLake/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateLake/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.UpdateLakeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateLakeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateLakeRequest.
 	}
 	op, err := c.UpdateLake(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateTask/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateTask/main.go
index 5d602c17a1f..bd827768db1 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/UpdateTask/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateTask/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.UpdateTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateTaskRequest.
 	}
 	op, err := c.UpdateTask(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/Client/UpdateZone/main.go b/internal/generated/snippets/dataplex/apiv1/Client/UpdateZone/main.go
index f6ce83b2b75..ff9e56f4e5a 100644
--- a/internal/generated/snippets/dataplex/apiv1/Client/UpdateZone/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/Client/UpdateZone/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.UpdateZoneRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateZoneRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateZoneRequest.
 	}
 	op, err := c.UpdateZone(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/ContentClient/CreateContent/main.go b/internal/generated/snippets/dataplex/apiv1/ContentClient/CreateContent/main.go
index ab8539dd855..d0afc9cfe00 100644
--- a/internal/generated/snippets/dataplex/apiv1/ContentClient/CreateContent/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/ContentClient/CreateContent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CreateContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateContentRequest.
 	}
 	resp, err := c.CreateContent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/ContentClient/DeleteContent/main.go b/internal/generated/snippets/dataplex/apiv1/ContentClient/DeleteContent/main.go
index b5cd9ad30e0..5cc2838c0ce 100644
--- a/internal/generated/snippets/dataplex/apiv1/ContentClient/DeleteContent/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/ContentClient/DeleteContent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.DeleteContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteContentRequest.
 	}
 	err = c.DeleteContent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/ContentClient/GetContent/main.go b/internal/generated/snippets/dataplex/apiv1/ContentClient/GetContent/main.go
index 5c3f3cd3dcd..bb6959ae9e4 100644
--- a/internal/generated/snippets/dataplex/apiv1/ContentClient/GetContent/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/ContentClient/GetContent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetContentRequest.
 	}
 	resp, err := c.GetContent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/ContentClient/ListContent/main.go b/internal/generated/snippets/dataplex/apiv1/ContentClient/ListContent/main.go
index 9f43f2f0454..9ccfad7a3ef 100644
--- a/internal/generated/snippets/dataplex/apiv1/ContentClient/ListContent/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/ContentClient/ListContent/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListContentRequest.
 	}
 	it := c.ListContent(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/ContentClient/UpdateContent/main.go b/internal/generated/snippets/dataplex/apiv1/ContentClient/UpdateContent/main.go
index 0d0e798eaf1..4ab2bdd436f 100644
--- a/internal/generated/snippets/dataplex/apiv1/ContentClient/UpdateContent/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/ContentClient/UpdateContent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.UpdateContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateContentRequest.
 	}
 	resp, err := c.UpdateContent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/CreateEntity/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/CreateEntity/main.go
index 3c377f6e9dc..259d822ec6d 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/CreateEntity/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/CreateEntity/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CreateEntityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreateEntityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreateEntityRequest.
 	}
 	resp, err := c.CreateEntity(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/CreatePartition/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/CreatePartition/main.go
index 9c7df42e24d..3031d109e18 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/CreatePartition/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/CreatePartition/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.CreatePartitionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#CreatePartitionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#CreatePartitionRequest.
 	}
 	resp, err := c.CreatePartition(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/DeleteEntity/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/DeleteEntity/main.go
index 170339e9b62..ec707057538 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/DeleteEntity/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/DeleteEntity/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.DeleteEntityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeleteEntityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeleteEntityRequest.
 	}
 	err = c.DeleteEntity(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/DeletePartition/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/DeletePartition/main.go
index 75979ebe7e7..dc68db5c323 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/DeletePartition/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/DeletePartition/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.DeletePartitionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#DeletePartitionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#DeletePartitionRequest.
 	}
 	err = c.DeletePartition(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetEntity/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetEntity/main.go
index bb70ebede26..aef867d5532 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetEntity/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetEntity/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetEntityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetEntityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetEntityRequest.
 	}
 	resp, err := c.GetEntity(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetPartition/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetPartition/main.go
index b8fdb05da23..957f661816c 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetPartition/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/GetPartition/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.GetPartitionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#GetPartitionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#GetPartitionRequest.
 	}
 	resp, err := c.GetPartition(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListEntities/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListEntities/main.go
index 070eb6b30ca..ad99001c28a 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListEntities/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListEntities/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListEntitiesRequest.
 	}
 	it := c.ListEntities(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListPartitions/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListPartitions/main.go
index 82c1ff9735c..93812e807a1 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListPartitions/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/ListPartitions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"google.golang.org/api/iterator"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataplexpb.ListPartitionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#ListPartitionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#ListPartitionsRequest.
 	}
 	it := c.ListPartitions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataplex/apiv1/MetadataClient/UpdateEntity/main.go b/internal/generated/snippets/dataplex/apiv1/MetadataClient/UpdateEntity/main.go
index f554ada6391..d66c9bc2802 100644
--- a/internal/generated/snippets/dataplex/apiv1/MetadataClient/UpdateEntity/main.go
+++ b/internal/generated/snippets/dataplex/apiv1/MetadataClient/UpdateEntity/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataplex "cloud.google.com/go/dataplex/apiv1"
-
-	dataplexpb "google.golang.org/genproto/googleapis/cloud/dataplex/v1"
+	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataplexpb.UpdateEntityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataplex/v1#UpdateEntityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataplex/apiv1/dataplexpb#UpdateEntityRequest.
 	}
 	resp, err := c.UpdateEntity(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataplex/apiv1/snippet_metadata.google.cloud.dataplex.v1.json b/internal/generated/snippets/dataplex/apiv1/snippet_metadata.google.cloud.dataplex.v1.json
index 1e97d12ae9d..57900c607dd 100644
--- a/internal/generated/snippets/dataplex/apiv1/snippet_metadata.google.cloud.dataplex.v1.json
+++ b/internal/generated/snippets/dataplex/apiv1/snippet_metadata.google.cloud.dataplex.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dataplex/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -51,7 +51,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -142,7 +142,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -188,7 +188,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -234,7 +234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -280,7 +280,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -326,7 +326,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -372,7 +372,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -464,7 +464,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -555,7 +555,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -601,7 +601,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -647,7 +647,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -693,7 +693,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -739,7 +739,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -785,7 +785,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -923,7 +923,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -969,7 +969,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1015,7 +1015,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1061,7 +1061,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1107,7 +1107,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1153,7 +1153,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1199,7 +1199,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1245,7 +1245,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1383,7 +1383,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1429,7 +1429,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1475,7 +1475,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1521,7 +1521,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1567,7 +1567,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1613,7 +1613,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1659,7 +1659,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1705,7 +1705,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1751,7 +1751,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1842,7 +1842,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1887,7 +1887,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -1978,7 +1978,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2162,7 +2162,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2392,7 +2392,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2483,7 +2483,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2529,7 +2529,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2574,7 +2574,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -2664,7 +2664,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -2710,7 +2710,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2848,7 +2848,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2894,7 +2894,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -3032,7 +3032,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -3078,7 +3078,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/CreateAutoscalingPolicy/main.go b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/CreateAutoscalingPolicy/main.go
index e7786cc5528..33f964431f0 100644
--- a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/CreateAutoscalingPolicy/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/CreateAutoscalingPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.CreateAutoscalingPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateAutoscalingPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateAutoscalingPolicyRequest.
 	}
 	resp, err := c.CreateAutoscalingPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/DeleteAutoscalingPolicy/main.go b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/DeleteAutoscalingPolicy/main.go
index 6ff2ad714bf..31a68b88457 100644
--- a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/DeleteAutoscalingPolicy/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/DeleteAutoscalingPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.DeleteAutoscalingPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteAutoscalingPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteAutoscalingPolicyRequest.
 	}
 	err = c.DeleteAutoscalingPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/GetAutoscalingPolicy/main.go b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/GetAutoscalingPolicy/main.go
index 4db707c0bb7..318f19a0752 100644
--- a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/GetAutoscalingPolicy/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/GetAutoscalingPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.GetAutoscalingPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetAutoscalingPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetAutoscalingPolicyRequest.
 	}
 	resp, err := c.GetAutoscalingPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/ListAutoscalingPolicies/main.go b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/ListAutoscalingPolicies/main.go
index fa5fe1c4587..62153366c81 100644
--- a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/ListAutoscalingPolicies/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/ListAutoscalingPolicies/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataprocpb.ListAutoscalingPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListAutoscalingPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListAutoscalingPoliciesRequest.
 	}
 	it := c.ListAutoscalingPolicies(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/UpdateAutoscalingPolicy/main.go b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/UpdateAutoscalingPolicy/main.go
index 05fcba08a28..e8bd7f706ce 100644
--- a/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/UpdateAutoscalingPolicy/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/AutoscalingPolicyClient/UpdateAutoscalingPolicy/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.UpdateAutoscalingPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#UpdateAutoscalingPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#UpdateAutoscalingPolicyRequest.
 	}
 	resp, err := c.UpdateAutoscalingPolicy(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/CreateBatch/main.go b/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/CreateBatch/main.go
index 785da0bb9bf..be6021d55ae 100644
--- a/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/CreateBatch/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/CreateBatch/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.CreateBatchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateBatchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateBatchRequest.
 	}
 	op, err := c.CreateBatch(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/DeleteBatch/main.go b/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/DeleteBatch/main.go
index 9e66057d0f7..8bf332b2caf 100644
--- a/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/DeleteBatch/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/DeleteBatch/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.DeleteBatchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteBatchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteBatchRequest.
 	}
 	err = c.DeleteBatch(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/GetBatch/main.go b/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/GetBatch/main.go
index d1cbdd88a7f..dc82136b3c6 100644
--- a/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/GetBatch/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/GetBatch/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.GetBatchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetBatchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetBatchRequest.
 	}
 	resp, err := c.GetBatch(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/ListBatches/main.go b/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/ListBatches/main.go
index 9bdecadb0ba..53077003b62 100644
--- a/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/ListBatches/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/BatchControllerClient/ListBatches/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataprocpb.ListBatchesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListBatchesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListBatchesRequest.
 	}
 	it := c.ListBatches(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/CreateCluster/main.go b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/CreateCluster/main.go
index 006532c1877..1273c5d0586 100644
--- a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/CreateCluster/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/CreateCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.CreateClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateClusterRequest.
 	}
 	op, err := c.CreateCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/DeleteCluster/main.go b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/DeleteCluster/main.go
index 4156530b128..0e3f8df1e11 100644
--- a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/DeleteCluster/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/DeleteCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.DeleteClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteClusterRequest.
 	}
 	op, err := c.DeleteCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/DiagnoseCluster/main.go b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/DiagnoseCluster/main.go
index ef487e05cb9..bea06807199 100644
--- a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/DiagnoseCluster/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/DiagnoseCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.DiagnoseClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DiagnoseClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DiagnoseClusterRequest.
 	}
 	op, err := c.DiagnoseCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/GetCluster/main.go b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/GetCluster/main.go
index 11c4f72d4ee..9577bcb75cf 100644
--- a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/GetCluster/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/GetCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.GetClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetClusterRequest.
 	}
 	resp, err := c.GetCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/ListClusters/main.go b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/ListClusters/main.go
index 5141f500b52..48542799f6b 100644
--- a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/ListClusters/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/ListClusters/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataprocpb.ListClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListClustersRequest.
 	}
 	it := c.ListClusters(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/StartCluster/main.go b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/StartCluster/main.go
index 9791de7e1ef..ea0dfb4126e 100644
--- a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/StartCluster/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/StartCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.StartClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#StartClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#StartClusterRequest.
 	}
 	op, err := c.StartCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/StopCluster/main.go b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/StopCluster/main.go
index facdf775183..35f51be1650 100644
--- a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/StopCluster/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/StopCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.StopClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#StopClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#StopClusterRequest.
 	}
 	op, err := c.StopCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/UpdateCluster/main.go b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/UpdateCluster/main.go
index aaa1641252b..3e24c0636ad 100644
--- a/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/UpdateCluster/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/ClusterControllerClient/UpdateCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.UpdateClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#UpdateClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#UpdateClusterRequest.
 	}
 	op, err := c.UpdateCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/CancelJob/main.go b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/CancelJob/main.go
index 666b0f11367..8a4397aee85 100644
--- a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/CancelJob/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/CancelJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.CancelJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CancelJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CancelJobRequest.
 	}
 	resp, err := c.CancelJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/DeleteJob/main.go b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/DeleteJob/main.go
index 1773436b556..5cfcf11338b 100644
--- a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/DeleteJob/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/DeleteJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.DeleteJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteJobRequest.
 	}
 	err = c.DeleteJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/GetJob/main.go b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/GetJob/main.go
index 179917c4f07..804790b7aef 100644
--- a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/GetJob/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/GetJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/ListJobs/main.go b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/ListJobs/main.go
index 0edfc5da578..4a9bcb5258d 100644
--- a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/ListJobs/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/ListJobs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataprocpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/SubmitJob/main.go b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/SubmitJob/main.go
index 6ec2a6fdf70..abb46afd671 100644
--- a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/SubmitJob/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/SubmitJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.SubmitJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#SubmitJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#SubmitJobRequest.
 	}
 	resp, err := c.SubmitJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/SubmitJobAsOperation/main.go b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/SubmitJobAsOperation/main.go
index d7d35897992..36685e0cd7a 100644
--- a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/SubmitJobAsOperation/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/SubmitJobAsOperation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.SubmitJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#SubmitJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#SubmitJobRequest.
 	}
 	op, err := c.SubmitJobAsOperation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/UpdateJob/main.go b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/UpdateJob/main.go
index 0bea952a5a0..cdc94426d49 100644
--- a/internal/generated/snippets/dataproc/apiv1/JobControllerClient/UpdateJob/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/JobControllerClient/UpdateJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.UpdateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#UpdateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#UpdateJobRequest.
 	}
 	resp, err := c.UpdateJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/CreateWorkflowTemplate/main.go b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/CreateWorkflowTemplate/main.go
index 29dc905b7f3..a2f2a0f8f97 100644
--- a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/CreateWorkflowTemplate/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/CreateWorkflowTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.CreateWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#CreateWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#CreateWorkflowTemplateRequest.
 	}
 	resp, err := c.CreateWorkflowTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/DeleteWorkflowTemplate/main.go b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/DeleteWorkflowTemplate/main.go
index aad8a490309..d380e67524a 100644
--- a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/DeleteWorkflowTemplate/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/DeleteWorkflowTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.DeleteWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#DeleteWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#DeleteWorkflowTemplateRequest.
 	}
 	err = c.DeleteWorkflowTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/GetWorkflowTemplate/main.go b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/GetWorkflowTemplate/main.go
index f68c11c95ff..9cbcacd3395 100644
--- a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/GetWorkflowTemplate/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/GetWorkflowTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.GetWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#GetWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#GetWorkflowTemplateRequest.
 	}
 	resp, err := c.GetWorkflowTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/InstantiateInlineWorkflowTemplate/main.go b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/InstantiateInlineWorkflowTemplate/main.go
index 55d7ffbdf8b..672a2caad55 100644
--- a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/InstantiateInlineWorkflowTemplate/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/InstantiateInlineWorkflowTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.InstantiateInlineWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#InstantiateInlineWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#InstantiateInlineWorkflowTemplateRequest.
 	}
 	op, err := c.InstantiateInlineWorkflowTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/InstantiateWorkflowTemplate/main.go b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/InstantiateWorkflowTemplate/main.go
index 4f618f0d9ec..3cf5822a9ec 100644
--- a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/InstantiateWorkflowTemplate/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/InstantiateWorkflowTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.InstantiateWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#InstantiateWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#InstantiateWorkflowTemplateRequest.
 	}
 	op, err := c.InstantiateWorkflowTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/ListWorkflowTemplates/main.go b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/ListWorkflowTemplates/main.go
index ac376651620..4127612708b 100644
--- a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/ListWorkflowTemplates/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/ListWorkflowTemplates/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 	"google.golang.org/api/iterator"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dataprocpb.ListWorkflowTemplatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#ListWorkflowTemplatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#ListWorkflowTemplatesRequest.
 	}
 	it := c.ListWorkflowTemplates(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/UpdateWorkflowTemplate/main.go b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/UpdateWorkflowTemplate/main.go
index c0a29f793e8..bb5db595fdc 100644
--- a/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/UpdateWorkflowTemplate/main.go
+++ b/internal/generated/snippets/dataproc/apiv1/WorkflowTemplateClient/UpdateWorkflowTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dataproc "cloud.google.com/go/dataproc/apiv1"
-
-	dataprocpb "google.golang.org/genproto/googleapis/cloud/dataproc/v1"
+	dataprocpb "cloud.google.com/go/dataproc/apiv1/dataprocpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dataprocpb.UpdateWorkflowTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dataproc/v1#UpdateWorkflowTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dataproc/apiv1/dataprocpb#UpdateWorkflowTemplateRequest.
 	}
 	resp, err := c.UpdateWorkflowTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dataproc/apiv1/snippet_metadata.google.cloud.dataproc.v1.json b/internal/generated/snippets/dataproc/apiv1/snippet_metadata.google.cloud.dataproc.v1.json
index 5c526e2532f..fcf126432d7 100644
--- a/internal/generated/snippets/dataproc/apiv1/snippet_metadata.google.cloud.dataproc.v1.json
+++ b/internal/generated/snippets/dataproc/apiv1/snippet_metadata.google.cloud.dataproc.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dataproc/apiv1",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -326,7 +326,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -372,7 +372,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -464,7 +464,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -510,7 +510,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -648,7 +648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -694,7 +694,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -740,7 +740,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -786,7 +786,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -832,7 +832,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -877,7 +877,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -923,7 +923,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -969,7 +969,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1015,7 +1015,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1061,7 +1061,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1107,7 +1107,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1153,7 +1153,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1198,7 +1198,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -1244,7 +1244,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1290,7 +1290,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -1336,7 +1336,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -1382,7 +1382,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1428,7 +1428,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/datastream/apiv1/Client/CreateConnectionProfile/main.go b/internal/generated/snippets/datastream/apiv1/Client/CreateConnectionProfile/main.go
index a538c608fa3..b0303976a33 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/CreateConnectionProfile/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/CreateConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.CreateConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#CreateConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#CreateConnectionProfileRequest.
 	}
 	op, err := c.CreateConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/CreatePrivateConnection/main.go b/internal/generated/snippets/datastream/apiv1/Client/CreatePrivateConnection/main.go
index fd910e50092..3a96c28c152 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/CreatePrivateConnection/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/CreatePrivateConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.CreatePrivateConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#CreatePrivateConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#CreatePrivateConnectionRequest.
 	}
 	op, err := c.CreatePrivateConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/CreateRoute/main.go b/internal/generated/snippets/datastream/apiv1/Client/CreateRoute/main.go
index 826abf568e6..768b586190e 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/CreateRoute/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/CreateRoute/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.CreateRouteRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#CreateRouteRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#CreateRouteRequest.
 	}
 	op, err := c.CreateRoute(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/CreateStream/main.go b/internal/generated/snippets/datastream/apiv1/Client/CreateStream/main.go
index 781cd291d67..55f3282aaaf 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/CreateStream/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/CreateStream/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.CreateStreamRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#CreateStreamRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#CreateStreamRequest.
 	}
 	op, err := c.CreateStream(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/DeleteConnectionProfile/main.go b/internal/generated/snippets/datastream/apiv1/Client/DeleteConnectionProfile/main.go
index 5c1eb2a294e..f555010fb09 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/DeleteConnectionProfile/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/DeleteConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.DeleteConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DeleteConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DeleteConnectionProfileRequest.
 	}
 	op, err := c.DeleteConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/DeletePrivateConnection/main.go b/internal/generated/snippets/datastream/apiv1/Client/DeletePrivateConnection/main.go
index 1626bc351b5..372a6dc9cbf 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/DeletePrivateConnection/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/DeletePrivateConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.DeletePrivateConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DeletePrivateConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DeletePrivateConnectionRequest.
 	}
 	op, err := c.DeletePrivateConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/DeleteRoute/main.go b/internal/generated/snippets/datastream/apiv1/Client/DeleteRoute/main.go
index a6da8686c7b..464ef2b3bcd 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/DeleteRoute/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/DeleteRoute/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.DeleteRouteRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DeleteRouteRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DeleteRouteRequest.
 	}
 	op, err := c.DeleteRoute(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/DeleteStream/main.go b/internal/generated/snippets/datastream/apiv1/Client/DeleteStream/main.go
index eccbc5722c8..b190bed8e32 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/DeleteStream/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/DeleteStream/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.DeleteStreamRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DeleteStreamRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DeleteStreamRequest.
 	}
 	op, err := c.DeleteStream(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/DiscoverConnectionProfile/main.go b/internal/generated/snippets/datastream/apiv1/Client/DiscoverConnectionProfile/main.go
index 438d2e274c4..29044b1b323 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/DiscoverConnectionProfile/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/DiscoverConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.DiscoverConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#DiscoverConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#DiscoverConnectionProfileRequest.
 	}
 	resp, err := c.DiscoverConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/FetchStaticIps/main.go b/internal/generated/snippets/datastream/apiv1/Client/FetchStaticIps/main.go
index bb1717a0a2c..6a146960c0f 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/FetchStaticIps/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/FetchStaticIps/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 	"google.golang.org/api/iterator"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datastreampb.FetchStaticIpsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#FetchStaticIpsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#FetchStaticIpsRequest.
 	}
 	it := c.FetchStaticIps(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/GetConnectionProfile/main.go b/internal/generated/snippets/datastream/apiv1/Client/GetConnectionProfile/main.go
index 79d7de45408..2ccec57a8b3 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/GetConnectionProfile/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/GetConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.GetConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetConnectionProfileRequest.
 	}
 	resp, err := c.GetConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/GetPrivateConnection/main.go b/internal/generated/snippets/datastream/apiv1/Client/GetPrivateConnection/main.go
index 8bbaf1cbd99..4d5fdabfd31 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/GetPrivateConnection/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/GetPrivateConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.GetPrivateConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetPrivateConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetPrivateConnectionRequest.
 	}
 	resp, err := c.GetPrivateConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/GetRoute/main.go b/internal/generated/snippets/datastream/apiv1/Client/GetRoute/main.go
index 6883301ecc2..5af0ea224c5 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/GetRoute/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/GetRoute/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.GetRouteRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetRouteRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetRouteRequest.
 	}
 	resp, err := c.GetRoute(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/GetStream/main.go b/internal/generated/snippets/datastream/apiv1/Client/GetStream/main.go
index b536b5e8aab..dec09f43a2b 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/GetStream/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/GetStream/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.GetStreamRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetStreamRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetStreamRequest.
 	}
 	resp, err := c.GetStream(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/GetStreamObject/main.go b/internal/generated/snippets/datastream/apiv1/Client/GetStreamObject/main.go
index e3a520240c9..49b02cc0f43 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/GetStreamObject/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/GetStreamObject/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.GetStreamObjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#GetStreamObjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#GetStreamObjectRequest.
 	}
 	resp, err := c.GetStreamObject(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/ListConnectionProfiles/main.go b/internal/generated/snippets/datastream/apiv1/Client/ListConnectionProfiles/main.go
index 98017406224..247f1b2207f 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/ListConnectionProfiles/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/ListConnectionProfiles/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 	"google.golang.org/api/iterator"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datastreampb.ListConnectionProfilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListConnectionProfilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListConnectionProfilesRequest.
 	}
 	it := c.ListConnectionProfiles(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/ListPrivateConnections/main.go b/internal/generated/snippets/datastream/apiv1/Client/ListPrivateConnections/main.go
index f84e2836666..55b110c6d37 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/ListPrivateConnections/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/ListPrivateConnections/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 	"google.golang.org/api/iterator"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datastreampb.ListPrivateConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListPrivateConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListPrivateConnectionsRequest.
 	}
 	it := c.ListPrivateConnections(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/ListRoutes/main.go b/internal/generated/snippets/datastream/apiv1/Client/ListRoutes/main.go
index 23d2567951a..3eb88be64a0 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/ListRoutes/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/ListRoutes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 	"google.golang.org/api/iterator"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datastreampb.ListRoutesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListRoutesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListRoutesRequest.
 	}
 	it := c.ListRoutes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/ListStreamObjects/main.go b/internal/generated/snippets/datastream/apiv1/Client/ListStreamObjects/main.go
index b88c4c52381..aa283a256fd 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/ListStreamObjects/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/ListStreamObjects/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 	"google.golang.org/api/iterator"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datastreampb.ListStreamObjectsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListStreamObjectsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListStreamObjectsRequest.
 	}
 	it := c.ListStreamObjects(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/ListStreams/main.go b/internal/generated/snippets/datastream/apiv1/Client/ListStreams/main.go
index 7fd0f05cc3f..5e14b4e38ad 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/ListStreams/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/ListStreams/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 	"google.golang.org/api/iterator"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &datastreampb.ListStreamsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#ListStreamsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#ListStreamsRequest.
 	}
 	it := c.ListStreams(ctx, req)
 	for {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/LookupStreamObject/main.go b/internal/generated/snippets/datastream/apiv1/Client/LookupStreamObject/main.go
index ea08ccacf58..d6e82e2684f 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/LookupStreamObject/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/LookupStreamObject/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.LookupStreamObjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#LookupStreamObjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#LookupStreamObjectRequest.
 	}
 	resp, err := c.LookupStreamObject(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/StartBackfillJob/main.go b/internal/generated/snippets/datastream/apiv1/Client/StartBackfillJob/main.go
index 14bbfb64d97..6965db94a11 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/StartBackfillJob/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/StartBackfillJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.StartBackfillJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#StartBackfillJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#StartBackfillJobRequest.
 	}
 	resp, err := c.StartBackfillJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/StopBackfillJob/main.go b/internal/generated/snippets/datastream/apiv1/Client/StopBackfillJob/main.go
index 2865bce345e..023340f3060 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/StopBackfillJob/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/StopBackfillJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.StopBackfillJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#StopBackfillJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#StopBackfillJobRequest.
 	}
 	resp, err := c.StopBackfillJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/UpdateConnectionProfile/main.go b/internal/generated/snippets/datastream/apiv1/Client/UpdateConnectionProfile/main.go
index 4fc1aab38d2..f3868a2a056 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/UpdateConnectionProfile/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/UpdateConnectionProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.UpdateConnectionProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#UpdateConnectionProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#UpdateConnectionProfileRequest.
 	}
 	op, err := c.UpdateConnectionProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/Client/UpdateStream/main.go b/internal/generated/snippets/datastream/apiv1/Client/UpdateStream/main.go
index 5947a428275..2516fedb1f2 100644
--- a/internal/generated/snippets/datastream/apiv1/Client/UpdateStream/main.go
+++ b/internal/generated/snippets/datastream/apiv1/Client/UpdateStream/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	datastream "cloud.google.com/go/datastream/apiv1"
-
-	datastreampb "google.golang.org/genproto/googleapis/cloud/datastream/v1"
+	datastreampb "cloud.google.com/go/datastream/apiv1/datastreampb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &datastreampb.UpdateStreamRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/datastream/v1#UpdateStreamRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/datastream/apiv1/datastreampb#UpdateStreamRequest.
 	}
 	op, err := c.UpdateStream(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/datastream/apiv1/snippet_metadata.google.cloud.datastream.v1.json b/internal/generated/snippets/datastream/apiv1/snippet_metadata.google.cloud.datastream.v1.json
index 04c164ce263..363e21df9ed 100644
--- a/internal/generated/snippets/datastream/apiv1/snippet_metadata.google.cloud.datastream.v1.json
+++ b/internal/generated/snippets/datastream/apiv1/snippet_metadata.google.cloud.datastream.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/datastream/apiv1",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -372,7 +372,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -464,7 +464,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -510,7 +510,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -740,7 +740,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -786,7 +786,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -832,7 +832,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -878,7 +878,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -924,7 +924,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1062,7 +1062,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1108,7 +1108,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1154,7 +1154,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1200,7 +1200,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1246,7 +1246,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1292,7 +1292,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1338,7 +1338,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1384,7 +1384,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1430,7 +1430,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/datastream/apiv1alpha1/snippet_metadata.google.cloud.datastream.v1alpha1.json b/internal/generated/snippets/datastream/apiv1alpha1/snippet_metadata.google.cloud.datastream.v1alpha1.json
index 38dc21ced54..34e31fab4d4 100644
--- a/internal/generated/snippets/datastream/apiv1alpha1/snippet_metadata.google.cloud.datastream.v1alpha1.json
+++ b/internal/generated/snippets/datastream/apiv1alpha1/snippet_metadata.google.cloud.datastream.v1alpha1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/datastream/apiv1alpha1",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/AbandonRelease/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/AbandonRelease/main.go
index bcf8ca03247..b1dcc613a9c 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/AbandonRelease/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/AbandonRelease/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.AbandonReleaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#AbandonReleaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#AbandonReleaseRequest.
 	}
 	resp, err := c.AbandonRelease(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ApproveRollout/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ApproveRollout/main.go
index 99a3bca8f09..9be30f05369 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ApproveRollout/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ApproveRollout/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.ApproveRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ApproveRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ApproveRolloutRequest.
 	}
 	resp, err := c.ApproveRollout(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateDeliveryPipeline/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateDeliveryPipeline/main.go
index 41cc30bde32..301456dffb0 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateDeliveryPipeline/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateDeliveryPipeline/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.CreateDeliveryPipelineRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#CreateDeliveryPipelineRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#CreateDeliveryPipelineRequest.
 	}
 	op, err := c.CreateDeliveryPipeline(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateRelease/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateRelease/main.go
index b8b4979e896..2278a7c4907 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateRelease/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateRelease/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.CreateReleaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#CreateReleaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#CreateReleaseRequest.
 	}
 	op, err := c.CreateRelease(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateRollout/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateRollout/main.go
index 74a7e5999ae..3238e36e2a1 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateRollout/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateRollout/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.CreateRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#CreateRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#CreateRolloutRequest.
 	}
 	op, err := c.CreateRollout(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateTarget/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateTarget/main.go
index c8be494b619..321968467c1 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateTarget/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/CreateTarget/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.CreateTargetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#CreateTargetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#CreateTargetRequest.
 	}
 	op, err := c.CreateTarget(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/DeleteDeliveryPipeline/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/DeleteDeliveryPipeline/main.go
index c04837c7a14..0ae01b5f01e 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/DeleteDeliveryPipeline/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/DeleteDeliveryPipeline/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.DeleteDeliveryPipelineRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#DeleteDeliveryPipelineRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#DeleteDeliveryPipelineRequest.
 	}
 	op, err := c.DeleteDeliveryPipeline(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/DeleteTarget/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/DeleteTarget/main.go
index 86572f77739..89537d9fc1a 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/DeleteTarget/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/DeleteTarget/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.DeleteTargetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#DeleteTargetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#DeleteTargetRequest.
 	}
 	op, err := c.DeleteTarget(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetConfig/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetConfig/main.go
index f02cc2a4ba5..be96ccda810 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetConfig/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.GetConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetConfigRequest.
 	}
 	resp, err := c.GetConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetDeliveryPipeline/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetDeliveryPipeline/main.go
index fdb30dd0f31..a793861f460 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetDeliveryPipeline/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetDeliveryPipeline/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.GetDeliveryPipelineRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetDeliveryPipelineRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetDeliveryPipelineRequest.
 	}
 	resp, err := c.GetDeliveryPipeline(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetJobRun/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetJobRun/main.go
index 8c72df7f582..d7cc0552a5e 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetJobRun/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetJobRun/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.GetJobRunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetJobRunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetJobRunRequest.
 	}
 	resp, err := c.GetJobRun(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetRelease/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetRelease/main.go
index 5de4396d831..b542a98a35f 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetRelease/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetRelease/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.GetReleaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetReleaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetReleaseRequest.
 	}
 	resp, err := c.GetRelease(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetRollout/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetRollout/main.go
index 220d534305f..06e4bec80aa 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetRollout/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetRollout/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.GetRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetRolloutRequest.
 	}
 	resp, err := c.GetRollout(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetTarget/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetTarget/main.go
index ff0776ecc9d..3f406323ae8 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetTarget/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/GetTarget/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.GetTargetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#GetTargetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#GetTargetRequest.
 	}
 	resp, err := c.GetTarget(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListDeliveryPipelines/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListDeliveryPipelines/main.go
index daeae79fbe6..2b27f540be2 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListDeliveryPipelines/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListDeliveryPipelines/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 	"google.golang.org/api/iterator"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &deploypb.ListDeliveryPipelinesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListDeliveryPipelinesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListDeliveryPipelinesRequest.
 	}
 	it := c.ListDeliveryPipelines(ctx, req)
 	for {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListJobRuns/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListJobRuns/main.go
index 1fa7b5a30ca..4278809ed3e 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListJobRuns/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListJobRuns/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 	"google.golang.org/api/iterator"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &deploypb.ListJobRunsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListJobRunsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListJobRunsRequest.
 	}
 	it := c.ListJobRuns(ctx, req)
 	for {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListReleases/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListReleases/main.go
index b9881235b54..9d4b76f0352 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListReleases/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListReleases/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 	"google.golang.org/api/iterator"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &deploypb.ListReleasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListReleasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListReleasesRequest.
 	}
 	it := c.ListReleases(ctx, req)
 	for {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListRollouts/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListRollouts/main.go
index bde72f37ba5..2ef490b539f 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListRollouts/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListRollouts/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 	"google.golang.org/api/iterator"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &deploypb.ListRolloutsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListRolloutsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListRolloutsRequest.
 	}
 	it := c.ListRollouts(ctx, req)
 	for {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListTargets/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListTargets/main.go
index 368b9c61fa9..64c717d8031 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListTargets/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/ListTargets/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 	"google.golang.org/api/iterator"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &deploypb.ListTargetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#ListTargetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#ListTargetsRequest.
 	}
 	it := c.ListTargets(ctx, req)
 	for {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/RetryJob/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/RetryJob/main.go
index fab7e21d082..7ea90cd988d 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/RetryJob/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/RetryJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.RetryJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#RetryJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#RetryJobRequest.
 	}
 	resp, err := c.RetryJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/UpdateDeliveryPipeline/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/UpdateDeliveryPipeline/main.go
index bcae416c0cd..f8492e19afd 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/UpdateDeliveryPipeline/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/UpdateDeliveryPipeline/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.UpdateDeliveryPipelineRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#UpdateDeliveryPipelineRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#UpdateDeliveryPipelineRequest.
 	}
 	op, err := c.UpdateDeliveryPipeline(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/UpdateTarget/main.go b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/UpdateTarget/main.go
index ef3be861cc2..9df0bacad69 100644
--- a/internal/generated/snippets/deploy/apiv1/CloudDeployClient/UpdateTarget/main.go
+++ b/internal/generated/snippets/deploy/apiv1/CloudDeployClient/UpdateTarget/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	deploy "cloud.google.com/go/deploy/apiv1"
-
-	deploypb "google.golang.org/genproto/googleapis/cloud/deploy/v1"
+	deploypb "cloud.google.com/go/deploy/apiv1/deploypb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &deploypb.UpdateTargetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/deploy/v1#UpdateTargetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/deploy/apiv1/deploypb#UpdateTargetRequest.
 	}
 	op, err := c.UpdateTarget(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/deploy/apiv1/snippet_metadata.google.cloud.deploy.v1.json b/internal/generated/snippets/deploy/apiv1/snippet_metadata.google.cloud.deploy.v1.json
index 2dd5c89e02e..ed8283699f0 100644
--- a/internal/generated/snippets/deploy/apiv1/snippet_metadata.google.cloud.deploy.v1.json
+++ b/internal/generated/snippets/deploy/apiv1/snippet_metadata.google.cloud.deploy.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/deploy/apiv1",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -464,7 +464,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -510,7 +510,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -648,7 +648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -786,7 +786,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -832,7 +832,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -878,7 +878,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -924,7 +924,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -970,7 +970,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1108,7 +1108,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1154,7 +1154,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1200,7 +1200,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1246,7 +1246,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1384,7 +1384,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1430,7 +1430,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/DeleteAgent/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/DeleteAgent/main.go
index b81e973bbdd..8ff06ad3be6 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/DeleteAgent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/DeleteAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteAgentRequest.
 	}
 	err = c.DeleteAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/ExportAgent/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/ExportAgent/main.go
index 093f1efe591..396224d4984 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/ExportAgent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/ExportAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.ExportAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ExportAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ExportAgentRequest.
 	}
 	op, err := c.ExportAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/GetAgent/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/GetAgent/main.go
index 0575e0b121e..d99b3219782 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/GetAgent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/GetAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetAgentRequest.
 	}
 	resp, err := c.GetAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/GetValidationResult/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/GetValidationResult/main.go
index 6d4f6de1360..cf5b2939d4d 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/GetValidationResult/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/GetValidationResult/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetValidationResultRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetValidationResultRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetValidationResultRequest.
 	}
 	resp, err := c.GetValidationResult(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/ImportAgent/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/ImportAgent/main.go
index a60271fbb9d..e12ee8b207d 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/ImportAgent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/ImportAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.ImportAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ImportAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ImportAgentRequest.
 	}
 	op, err := c.ImportAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/RestoreAgent/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/RestoreAgent/main.go
index ad8bde18e75..0a911a9aaeb 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/RestoreAgent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/RestoreAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.RestoreAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#RestoreAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#RestoreAgentRequest.
 	}
 	op, err := c.RestoreAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/SearchAgents/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/SearchAgents/main.go
index 995bfcd678d..7dc59e3abff 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/SearchAgents/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/SearchAgents/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.SearchAgentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SearchAgentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SearchAgentsRequest.
 	}
 	it := c.SearchAgents(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/SetAgent/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/SetAgent/main.go
index be336f0181e..0f5dc1641e9 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/SetAgent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/SetAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.SetAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SetAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SetAgentRequest.
 	}
 	resp, err := c.SetAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/TrainAgent/main.go b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/TrainAgent/main.go
index 93befeaf922..6c0e05bb86d 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AgentsClient/TrainAgent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AgentsClient/TrainAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.TrainAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#TrainAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#TrainAgentRequest.
 	}
 	op, err := c.TrainAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AnswerRecordsClient/ListAnswerRecords/main.go b/internal/generated/snippets/dialogflow/apiv2/AnswerRecordsClient/ListAnswerRecords/main.go
index 872eecc79af..16092c1abf9 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AnswerRecordsClient/ListAnswerRecords/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AnswerRecordsClient/ListAnswerRecords/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListAnswerRecordsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListAnswerRecordsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListAnswerRecordsRequest.
 	}
 	it := c.ListAnswerRecords(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/AnswerRecordsClient/UpdateAnswerRecord/main.go b/internal/generated/snippets/dialogflow/apiv2/AnswerRecordsClient/UpdateAnswerRecord/main.go
index a2c0726230c..15232ca3206 100644
--- a/internal/generated/snippets/dialogflow/apiv2/AnswerRecordsClient/UpdateAnswerRecord/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/AnswerRecordsClient/UpdateAnswerRecord/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateAnswerRecordRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateAnswerRecordRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateAnswerRecordRequest.
 	}
 	resp, err := c.UpdateAnswerRecord(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/CreateContext/main.go b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/CreateContext/main.go
index cd14d060e47..697bc6aab67 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/CreateContext/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/CreateContext/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateContextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateContextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateContextRequest.
 	}
 	resp, err := c.CreateContext(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/DeleteAllContexts/main.go b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/DeleteAllContexts/main.go
index f663ceffd7a..1a6aea55e5d 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/DeleteAllContexts/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/DeleteAllContexts/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteAllContextsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteAllContextsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteAllContextsRequest.
 	}
 	err = c.DeleteAllContexts(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/DeleteContext/main.go b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/DeleteContext/main.go
index 915aaf29246..6d2ee984ab6 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/DeleteContext/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/DeleteContext/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteContextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteContextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteContextRequest.
 	}
 	err = c.DeleteContext(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/GetContext/main.go b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/GetContext/main.go
index 57424c10b8f..17350677e85 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/GetContext/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/GetContext/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetContextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetContextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetContextRequest.
 	}
 	resp, err := c.GetContext(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/ListContexts/main.go b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/ListContexts/main.go
index 112893f3d2a..bf9ced65a94 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/ListContexts/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/ListContexts/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListContextsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListContextsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListContextsRequest.
 	}
 	it := c.ListContexts(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/UpdateContext/main.go b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/UpdateContext/main.go
index b303cff3aef..d94dbb357b4 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ContextsClient/UpdateContext/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ContextsClient/UpdateContext/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateContextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateContextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateContextRequest.
 	}
 	resp, err := c.UpdateContext(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/CreateConversationDataset/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/CreateConversationDataset/main.go
index f75dbb772b7..92fe8f80a8b 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/CreateConversationDataset/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/CreateConversationDataset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateConversationDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationDatasetRequest.
 	}
 	op, err := c.CreateConversationDataset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/DeleteConversationDataset/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/DeleteConversationDataset/main.go
index 20cbc28d404..cca276c1074 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/DeleteConversationDataset/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/DeleteConversationDataset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteConversationDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteConversationDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteConversationDatasetRequest.
 	}
 	op, err := c.DeleteConversationDataset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/GetConversationDataset/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/GetConversationDataset/main.go
index 97a82a86907..da4d7058c04 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/GetConversationDataset/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/GetConversationDataset/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetConversationDatasetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationDatasetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationDatasetRequest.
 	}
 	resp, err := c.GetConversationDataset(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/ImportConversationData/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/ImportConversationData/main.go
index 6a965ef6e6a..8fcfcf6774c 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/ImportConversationData/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/ImportConversationData/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.ImportConversationDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ImportConversationDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ImportConversationDataRequest.
 	}
 	op, err := c.ImportConversationData(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/ListConversationDatasets/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/ListConversationDatasets/main.go
index 4ddae20a167..53a6e1313e0 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/ListConversationDatasets/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationDatasetsClient/ListConversationDatasets/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListConversationDatasetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationDatasetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationDatasetsRequest.
 	}
 	it := c.ListConversationDatasets(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/CreateConversationModel/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/CreateConversationModel/main.go
index b524a159536..f6546271a1c 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/CreateConversationModel/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/CreateConversationModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationModelRequest.
 	}
 	op, err := c.CreateConversationModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/CreateConversationModelEvaluation/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/CreateConversationModelEvaluation/main.go
index 0d7fd315777..9433304fd56 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/CreateConversationModelEvaluation/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/CreateConversationModelEvaluation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateConversationModelEvaluationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationModelEvaluationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationModelEvaluationRequest.
 	}
 	op, err := c.CreateConversationModelEvaluation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/DeleteConversationModel/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/DeleteConversationModel/main.go
index 3f7eddc8ec6..1e191e226e4 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/DeleteConversationModel/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/DeleteConversationModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteConversationModelRequest.
 	}
 	op, err := c.DeleteConversationModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/DeployConversationModel/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/DeployConversationModel/main.go
index 004358b61d5..7cabb6946b8 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/DeployConversationModel/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/DeployConversationModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeployConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeployConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeployConversationModelRequest.
 	}
 	op, err := c.DeployConversationModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/GetConversationModel/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/GetConversationModel/main.go
index 78bd8eae943..fdbf051de67 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/GetConversationModel/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/GetConversationModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationModelRequest.
 	}
 	resp, err := c.GetConversationModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/GetConversationModelEvaluation/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/GetConversationModelEvaluation/main.go
index 955a814212d..648d12f74b7 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/GetConversationModelEvaluation/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/GetConversationModelEvaluation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetConversationModelEvaluationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationModelEvaluationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationModelEvaluationRequest.
 	}
 	resp, err := c.GetConversationModelEvaluation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/ListConversationModelEvaluations/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/ListConversationModelEvaluations/main.go
index be9d65547f3..c218604d5e4 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/ListConversationModelEvaluations/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/ListConversationModelEvaluations/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListConversationModelEvaluationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationModelEvaluationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationModelEvaluationsRequest.
 	}
 	it := c.ListConversationModelEvaluations(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/ListConversationModels/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/ListConversationModels/main.go
index 4d32772d0b7..ecfb8985a88 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/ListConversationModels/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/ListConversationModels/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListConversationModelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationModelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationModelsRequest.
 	}
 	it := c.ListConversationModels(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/UndeployConversationModel/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/UndeployConversationModel/main.go
index 40cf6894e08..dcaec23ae09 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/UndeployConversationModel/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationModelsClient/UndeployConversationModel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UndeployConversationModelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UndeployConversationModelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UndeployConversationModelRequest.
 	}
 	op, err := c.UndeployConversationModel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/ClearSuggestionFeatureConfig/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/ClearSuggestionFeatureConfig/main.go
index 7e7f51f2646..ec010cf747f 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/ClearSuggestionFeatureConfig/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/ClearSuggestionFeatureConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.ClearSuggestionFeatureConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ClearSuggestionFeatureConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ClearSuggestionFeatureConfigRequest.
 	}
 	op, err := c.ClearSuggestionFeatureConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/CreateConversationProfile/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/CreateConversationProfile/main.go
index af1587020b4..e58cd8231ed 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/CreateConversationProfile/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/CreateConversationProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateConversationProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationProfileRequest.
 	}
 	resp, err := c.CreateConversationProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/DeleteConversationProfile/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/DeleteConversationProfile/main.go
index d304a2309af..9b33c490142 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/DeleteConversationProfile/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/DeleteConversationProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteConversationProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteConversationProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteConversationProfileRequest.
 	}
 	err = c.DeleteConversationProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/GetConversationProfile/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/GetConversationProfile/main.go
index 5ce7da10980..67e2aabb915 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/GetConversationProfile/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/GetConversationProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetConversationProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationProfileRequest.
 	}
 	resp, err := c.GetConversationProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/ListConversationProfiles/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/ListConversationProfiles/main.go
index d2ea810ef7c..350a3dde96c 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/ListConversationProfiles/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/ListConversationProfiles/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListConversationProfilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationProfilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationProfilesRequest.
 	}
 	it := c.ListConversationProfiles(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/SetSuggestionFeatureConfig/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/SetSuggestionFeatureConfig/main.go
index c75c9aa2e71..dd40f3a7121 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/SetSuggestionFeatureConfig/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/SetSuggestionFeatureConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.SetSuggestionFeatureConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SetSuggestionFeatureConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SetSuggestionFeatureConfigRequest.
 	}
 	op, err := c.SetSuggestionFeatureConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/UpdateConversationProfile/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/UpdateConversationProfile/main.go
index b6e10400100..dabf23c4ae3 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/UpdateConversationProfile/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationProfilesClient/UpdateConversationProfile/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateConversationProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateConversationProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateConversationProfileRequest.
 	}
 	resp, err := c.UpdateConversationProfile(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/CompleteConversation/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/CompleteConversation/main.go
index d7838acde6d..82a12fc8244 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/CompleteConversation/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/CompleteConversation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CompleteConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CompleteConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CompleteConversationRequest.
 	}
 	resp, err := c.CompleteConversation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/CreateConversation/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/CreateConversation/main.go
index 50ce383839a..c782b8880b7 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/CreateConversation/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/CreateConversation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateConversationRequest.
 	}
 	resp, err := c.CreateConversation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/GetConversation/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/GetConversation/main.go
index b13031e9a73..8f36ae90426 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/GetConversation/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/GetConversation/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetConversationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetConversationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetConversationRequest.
 	}
 	resp, err := c.GetConversation(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/ListConversations/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/ListConversations/main.go
index 28b5fecadc3..9cbdd2eb96e 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/ListConversations/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/ListConversations/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListConversationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListConversationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListConversationsRequest.
 	}
 	it := c.ListConversations(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/ListMessages/main.go b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/ListMessages/main.go
index 734651cad6a..4c741d45bdf 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/ListMessages/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ConversationsClient/ListMessages/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListMessagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListMessagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListMessagesRequest.
 	}
 	it := c.ListMessages(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/CreateDocument/main.go b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/CreateDocument/main.go
index 16d2551c512..8f125022caf 100644
--- a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/CreateDocument/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/CreateDocument/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateDocumentRequest.
 	}
 	op, err := c.CreateDocument(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/DeleteDocument/main.go b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/DeleteDocument/main.go
index 7e34f484ec3..2d19d098f3f 100644
--- a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/DeleteDocument/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/DeleteDocument/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteDocumentRequest.
 	}
 	op, err := c.DeleteDocument(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ExportDocument/main.go b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ExportDocument/main.go
index 3d8017cb273..d3c24833417 100644
--- a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ExportDocument/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ExportDocument/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.ExportDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ExportDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ExportDocumentRequest.
 	}
 	op, err := c.ExportDocument(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/GetDocument/main.go b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/GetDocument/main.go
index be80e493da7..55c62cb1532 100644
--- a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/GetDocument/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/GetDocument/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetDocumentRequest.
 	}
 	resp, err := c.GetDocument(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ImportDocuments/main.go b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ImportDocuments/main.go
index 4396267fbeb..0f3148a95ec 100644
--- a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ImportDocuments/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ImportDocuments/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.ImportDocumentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ImportDocumentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ImportDocumentsRequest.
 	}
 	op, err := c.ImportDocuments(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ListDocuments/main.go b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ListDocuments/main.go
index c48d147e375..74a603a6757 100644
--- a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ListDocuments/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ListDocuments/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListDocumentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListDocumentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListDocumentsRequest.
 	}
 	it := c.ListDocuments(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ReloadDocument/main.go b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ReloadDocument/main.go
index a6a745d2f59..d6ce1fe38c9 100644
--- a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ReloadDocument/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/ReloadDocument/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.ReloadDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ReloadDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ReloadDocumentRequest.
 	}
 	op, err := c.ReloadDocument(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/UpdateDocument/main.go b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/UpdateDocument/main.go
index 459a925e57c..6c83116b8b0 100644
--- a/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/UpdateDocument/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/DocumentsClient/UpdateDocument/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateDocumentRequest.
 	}
 	op, err := c.UpdateDocument(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchCreateEntities/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchCreateEntities/main.go
index 6aa0d96c887..cd6e5bf3f4e 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchCreateEntities/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchCreateEntities/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.BatchCreateEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchCreateEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchCreateEntitiesRequest.
 	}
 	op, err := c.BatchCreateEntities(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchDeleteEntities/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchDeleteEntities/main.go
index 104fed67899..5ba1c238b2c 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchDeleteEntities/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchDeleteEntities/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.BatchDeleteEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchDeleteEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchDeleteEntitiesRequest.
 	}
 	op, err := c.BatchDeleteEntities(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchDeleteEntityTypes/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchDeleteEntityTypes/main.go
index 1238683508e..1b77c1cbf7a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchDeleteEntityTypes/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchDeleteEntityTypes/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.BatchDeleteEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchDeleteEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchDeleteEntityTypesRequest.
 	}
 	op, err := c.BatchDeleteEntityTypes(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchUpdateEntities/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchUpdateEntities/main.go
index b9bb15cc157..f9916a2e7b9 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchUpdateEntities/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchUpdateEntities/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.BatchUpdateEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchUpdateEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchUpdateEntitiesRequest.
 	}
 	op, err := c.BatchUpdateEntities(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchUpdateEntityTypes/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchUpdateEntityTypes/main.go
index a5fdb1c690c..957780d868a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchUpdateEntityTypes/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/BatchUpdateEntityTypes/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.BatchUpdateEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchUpdateEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchUpdateEntityTypesRequest.
 	}
 	op, err := c.BatchUpdateEntityTypes(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/CreateEntityType/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/CreateEntityType/main.go
index ee856624f56..59d1ec68ce4 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/CreateEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/CreateEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateEntityTypeRequest.
 	}
 	resp, err := c.CreateEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/DeleteEntityType/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/DeleteEntityType/main.go
index b3c00fe1896..6c3f5462d49 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/DeleteEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/DeleteEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteEntityTypeRequest.
 	}
 	err = c.DeleteEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/GetEntityType/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/GetEntityType/main.go
index 98b4f63b6b8..2897b51adcb 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/GetEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/GetEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetEntityTypeRequest.
 	}
 	resp, err := c.GetEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/ListEntityTypes/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/ListEntityTypes/main.go
index 117543a5071..e243f46f86b 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/ListEntityTypes/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/ListEntityTypes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListEntityTypesRequest.
 	}
 	it := c.ListEntityTypes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/UpdateEntityType/main.go b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/UpdateEntityType/main.go
index 41853aa1717..ac50426b1ac 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/UpdateEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EntityTypesClient/UpdateEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateEntityTypeRequest.
 	}
 	resp, err := c.UpdateEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/CreateEnvironment/main.go b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/CreateEnvironment/main.go
index 3b2ce32fc07..19fe1a453d0 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/CreateEnvironment/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/CreateEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateEnvironmentRequest.
 	}
 	resp, err := c.CreateEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/DeleteEnvironment/main.go b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/DeleteEnvironment/main.go
index 1a8b7c631a2..092ac5e2c8a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/DeleteEnvironment/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/DeleteEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteEnvironmentRequest.
 	}
 	err = c.DeleteEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/GetEnvironment/main.go b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/GetEnvironment/main.go
index e4cf60e2219..581bf82fe4a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/GetEnvironment/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/GetEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/GetEnvironmentHistory/main.go b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/GetEnvironmentHistory/main.go
index c83d7d156ab..7f6edc4d03d 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/GetEnvironmentHistory/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/GetEnvironmentHistory/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.GetEnvironmentHistoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetEnvironmentHistoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetEnvironmentHistoryRequest.
 	}
 	it := c.GetEnvironmentHistory(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/ListEnvironments/main.go b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/ListEnvironments/main.go
index ff9bd4b84bf..e676efbecb0 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/ListEnvironments/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/ListEnvironments/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListEnvironmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListEnvironmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListEnvironmentsRequest.
 	}
 	it := c.ListEnvironments(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/UpdateEnvironment/main.go b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/UpdateEnvironment/main.go
index 8c4a40807e5..d52e03cfb3d 100644
--- a/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/UpdateEnvironment/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/EnvironmentsClient/UpdateEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateEnvironmentRequest.
 	}
 	resp, err := c.UpdateEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/FulfillmentsClient/GetFulfillment/main.go b/internal/generated/snippets/dialogflow/apiv2/FulfillmentsClient/GetFulfillment/main.go
index 1df3f36cb59..d3b5ea06cd5 100644
--- a/internal/generated/snippets/dialogflow/apiv2/FulfillmentsClient/GetFulfillment/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/FulfillmentsClient/GetFulfillment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetFulfillmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetFulfillmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetFulfillmentRequest.
 	}
 	resp, err := c.GetFulfillment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/FulfillmentsClient/UpdateFulfillment/main.go b/internal/generated/snippets/dialogflow/apiv2/FulfillmentsClient/UpdateFulfillment/main.go
index 298e18bae0c..86816c6a432 100644
--- a/internal/generated/snippets/dialogflow/apiv2/FulfillmentsClient/UpdateFulfillment/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/FulfillmentsClient/UpdateFulfillment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateFulfillmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateFulfillmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateFulfillmentRequest.
 	}
 	resp, err := c.UpdateFulfillment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/BatchDeleteIntents/main.go b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/BatchDeleteIntents/main.go
index 2a58c625d06..e71e9689df2 100644
--- a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/BatchDeleteIntents/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/BatchDeleteIntents/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.BatchDeleteIntentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchDeleteIntentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchDeleteIntentsRequest.
 	}
 	op, err := c.BatchDeleteIntents(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/BatchUpdateIntents/main.go b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/BatchUpdateIntents/main.go
index 090df63bca4..00447c70a6f 100644
--- a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/BatchUpdateIntents/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/BatchUpdateIntents/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.BatchUpdateIntentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#BatchUpdateIntentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#BatchUpdateIntentsRequest.
 	}
 	op, err := c.BatchUpdateIntents(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/CreateIntent/main.go b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/CreateIntent/main.go
index 8f56ec8127e..798bc896e1e 100644
--- a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/CreateIntent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/CreateIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateIntentRequest.
 	}
 	resp, err := c.CreateIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/DeleteIntent/main.go b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/DeleteIntent/main.go
index 5820f2309d4..4a516c1004a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/DeleteIntent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/DeleteIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteIntentRequest.
 	}
 	err = c.DeleteIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/GetIntent/main.go b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/GetIntent/main.go
index 3f24a8a307a..ab1236007bd 100644
--- a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/GetIntent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/GetIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetIntentRequest.
 	}
 	resp, err := c.GetIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/ListIntents/main.go b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/ListIntents/main.go
index a0e854cce3a..f5aea5515fb 100644
--- a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/ListIntents/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/ListIntents/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListIntentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListIntentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListIntentsRequest.
 	}
 	it := c.ListIntents(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/UpdateIntent/main.go b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/UpdateIntent/main.go
index adf03d8640b..4404bea7337 100644
--- a/internal/generated/snippets/dialogflow/apiv2/IntentsClient/UpdateIntent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/IntentsClient/UpdateIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateIntentRequest.
 	}
 	resp, err := c.UpdateIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/CreateKnowledgeBase/main.go b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/CreateKnowledgeBase/main.go
index b5d4eff97d0..3b4a5336b20 100644
--- a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/CreateKnowledgeBase/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/CreateKnowledgeBase/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateKnowledgeBaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateKnowledgeBaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateKnowledgeBaseRequest.
 	}
 	resp, err := c.CreateKnowledgeBase(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/DeleteKnowledgeBase/main.go b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/DeleteKnowledgeBase/main.go
index 149025f6405..5a33e649165 100644
--- a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/DeleteKnowledgeBase/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/DeleteKnowledgeBase/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteKnowledgeBaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteKnowledgeBaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteKnowledgeBaseRequest.
 	}
 	err = c.DeleteKnowledgeBase(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/GetKnowledgeBase/main.go b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/GetKnowledgeBase/main.go
index cfe09c71c39..4b12c59b13b 100644
--- a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/GetKnowledgeBase/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/GetKnowledgeBase/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetKnowledgeBaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetKnowledgeBaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetKnowledgeBaseRequest.
 	}
 	resp, err := c.GetKnowledgeBase(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/ListKnowledgeBases/main.go b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/ListKnowledgeBases/main.go
index a74032a47f8..4b1f4a1b973 100644
--- a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/ListKnowledgeBases/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/ListKnowledgeBases/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListKnowledgeBasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListKnowledgeBasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListKnowledgeBasesRequest.
 	}
 	it := c.ListKnowledgeBases(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/UpdateKnowledgeBase/main.go b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/UpdateKnowledgeBase/main.go
index 001fb33ea2f..9bb62e6f78a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/UpdateKnowledgeBase/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/KnowledgeBasesClient/UpdateKnowledgeBase/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateKnowledgeBaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateKnowledgeBaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateKnowledgeBaseRequest.
 	}
 	resp, err := c.UpdateKnowledgeBase(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/AnalyzeContent/main.go b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/AnalyzeContent/main.go
index 27b4c6b4873..ab1041337d1 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/AnalyzeContent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/AnalyzeContent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.AnalyzeContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#AnalyzeContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#AnalyzeContentRequest.
 	}
 	resp, err := c.AnalyzeContent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/CreateParticipant/main.go b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/CreateParticipant/main.go
index b59c47c4b21..2387369283a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/CreateParticipant/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/CreateParticipant/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateParticipantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateParticipantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateParticipantRequest.
 	}
 	resp, err := c.CreateParticipant(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/GetParticipant/main.go b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/GetParticipant/main.go
index f200ace8d49..7c2beffbc79 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/GetParticipant/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/GetParticipant/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetParticipantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetParticipantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetParticipantRequest.
 	}
 	resp, err := c.GetParticipant(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/ListParticipants/main.go b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/ListParticipants/main.go
index afdb92333a5..014aae9632a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/ListParticipants/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/ListParticipants/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListParticipantsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListParticipantsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListParticipantsRequest.
 	}
 	it := c.ListParticipants(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestArticles/main.go b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestArticles/main.go
index 1f7d4439a18..ef51061c681 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestArticles/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestArticles/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.SuggestArticlesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SuggestArticlesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SuggestArticlesRequest.
 	}
 	resp, err := c.SuggestArticles(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestFaqAnswers/main.go b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestFaqAnswers/main.go
index 26d8f93aa1d..8d47563329a 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestFaqAnswers/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestFaqAnswers/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.SuggestFaqAnswersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SuggestFaqAnswersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SuggestFaqAnswersRequest.
 	}
 	resp, err := c.SuggestFaqAnswers(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestSmartReplies/main.go b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestSmartReplies/main.go
index 12b1a779edf..8700cea9b82 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestSmartReplies/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/SuggestSmartReplies/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.SuggestSmartRepliesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#SuggestSmartRepliesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#SuggestSmartRepliesRequest.
 	}
 	resp, err := c.SuggestSmartReplies(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/UpdateParticipant/main.go b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/UpdateParticipant/main.go
index 3b4682da796..eca9659b853 100644
--- a/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/UpdateParticipant/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/ParticipantsClient/UpdateParticipant/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateParticipantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateParticipantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateParticipantRequest.
 	}
 	resp, err := c.UpdateParticipant(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/CreateSessionEntityType/main.go b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/CreateSessionEntityType/main.go
index 42546a0c97c..5f521188b73 100644
--- a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/CreateSessionEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/CreateSessionEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateSessionEntityTypeRequest.
 	}
 	resp, err := c.CreateSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/DeleteSessionEntityType/main.go b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/DeleteSessionEntityType/main.go
index b88f9e1ea68..697f0c40c61 100644
--- a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/DeleteSessionEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/DeleteSessionEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteSessionEntityTypeRequest.
 	}
 	err = c.DeleteSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/GetSessionEntityType/main.go b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/GetSessionEntityType/main.go
index 6ebbb8d943f..969790841d6 100644
--- a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/GetSessionEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/GetSessionEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetSessionEntityTypeRequest.
 	}
 	resp, err := c.GetSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/ListSessionEntityTypes/main.go b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/ListSessionEntityTypes/main.go
index a7911847c20..992da18e576 100644
--- a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/ListSessionEntityTypes/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/ListSessionEntityTypes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListSessionEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListSessionEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListSessionEntityTypesRequest.
 	}
 	it := c.ListSessionEntityTypes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/UpdateSessionEntityType/main.go b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/UpdateSessionEntityType/main.go
index 167975a1564..f5e314706e7 100644
--- a/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/UpdateSessionEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/SessionEntityTypesClient/UpdateSessionEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateSessionEntityTypeRequest.
 	}
 	resp, err := c.UpdateSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/SessionsClient/DetectIntent/main.go b/internal/generated/snippets/dialogflow/apiv2/SessionsClient/DetectIntent/main.go
index 5f52f59ae5d..12902100bfd 100644
--- a/internal/generated/snippets/dialogflow/apiv2/SessionsClient/DetectIntent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/SessionsClient/DetectIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DetectIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DetectIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DetectIntentRequest.
 	}
 	resp, err := c.DetectIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/SessionsClient/StreamingDetectIntent/main.go b/internal/generated/snippets/dialogflow/apiv2/SessionsClient/StreamingDetectIntent/main.go
index 1be51548fdf..d25f021ec7e 100644
--- a/internal/generated/snippets/dialogflow/apiv2/SessionsClient/StreamingDetectIntent/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/SessionsClient/StreamingDetectIntent/main.go
@@ -23,8 +23,7 @@ import (
 	"io"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
diff --git a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/CreateVersion/main.go b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/CreateVersion/main.go
index 8f560c9d81f..071b32a0a8c 100644
--- a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/CreateVersion/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/CreateVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.CreateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#CreateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#CreateVersionRequest.
 	}
 	resp, err := c.CreateVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/DeleteVersion/main.go b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/DeleteVersion/main.go
index a78e7665a90..b4d72a30e3c 100644
--- a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/DeleteVersion/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/DeleteVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.DeleteVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#DeleteVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#DeleteVersionRequest.
 	}
 	err = c.DeleteVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/GetVersion/main.go b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/GetVersion/main.go
index 6c1d009d28a..ff6b8435ee1 100644
--- a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/GetVersion/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/GetVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.GetVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#GetVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#GetVersionRequest.
 	}
 	resp, err := c.GetVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/ListVersions/main.go b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/ListVersions/main.go
index ce5b47284e1..ffc4734a431 100644
--- a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/ListVersions/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/ListVersions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 	"google.golang.org/api/iterator"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dialogflowpb.ListVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#ListVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#ListVersionsRequest.
 	}
 	it := c.ListVersions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/UpdateVersion/main.go b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/UpdateVersion/main.go
index 4bea9e8c147..8bfe286359f 100644
--- a/internal/generated/snippets/dialogflow/apiv2/VersionsClient/UpdateVersion/main.go
+++ b/internal/generated/snippets/dialogflow/apiv2/VersionsClient/UpdateVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dialogflow "cloud.google.com/go/dialogflow/apiv2"
-
-	dialogflowpb "google.golang.org/genproto/googleapis/cloud/dialogflow/v2"
+	dialogflowpb "cloud.google.com/go/dialogflow/apiv2/dialogflowpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dialogflowpb.UpdateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/v2#UpdateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/apiv2/dialogflowpb#UpdateVersionRequest.
 	}
 	resp, err := c.UpdateVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/apiv2/snippet_metadata.google.cloud.dialogflow.v2.json b/internal/generated/snippets/dialogflow/apiv2/snippet_metadata.google.cloud.dialogflow.v2.json
index 86ba803a3f6..e1e29e68515 100644
--- a/internal/generated/snippets/dialogflow/apiv2/snippet_metadata.google.cloud.dialogflow.v2.json
+++ b/internal/generated/snippets/dialogflow/apiv2/snippet_metadata.google.cloud.dialogflow.v2.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dialogflow/apiv2",
-    "version": "1.17.0",
+    "version": "1.18.0",
     "language": "GO",
     "apis": [
       {
@@ -96,7 +96,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -142,7 +142,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -188,7 +188,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -326,7 +326,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -372,7 +372,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -510,7 +510,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -648,7 +648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -831,7 +831,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -969,7 +969,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1060,7 +1060,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1105,7 +1105,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -1150,7 +1150,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -1196,7 +1196,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1334,7 +1334,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1472,7 +1472,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1563,7 +1563,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1609,7 +1609,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -1655,7 +1655,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1793,7 +1793,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1839,7 +1839,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2022,7 +2022,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -2068,7 +2068,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -2114,7 +2114,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -2160,7 +2160,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -2206,7 +2206,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2252,7 +2252,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2390,7 +2390,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2436,7 +2436,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2574,7 +2574,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -2665,7 +2665,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -2711,7 +2711,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2756,7 +2756,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -2802,7 +2802,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2940,7 +2940,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -3078,7 +3078,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -3124,7 +3124,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3215,7 +3215,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3261,7 +3261,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3307,7 +3307,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3445,7 +3445,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -3537,7 +3537,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -3674,7 +3674,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -3720,7 +3720,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -3766,7 +3766,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -3812,7 +3812,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3950,7 +3950,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -3996,7 +3996,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -4134,7 +4134,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -4180,7 +4180,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -4226,7 +4226,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -4272,7 +4272,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -4318,7 +4318,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -4364,7 +4364,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -4410,7 +4410,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -4501,7 +4501,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4546,7 +4546,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -4592,7 +4592,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4730,7 +4730,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -4868,7 +4868,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4959,7 +4959,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5004,7 +5004,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -5050,7 +5050,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5096,7 +5096,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -5234,7 +5234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -5372,7 +5372,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5463,7 +5463,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5693,7 +5693,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5739,7 +5739,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -5785,7 +5785,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -5876,7 +5876,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5921,7 +5921,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -5967,7 +5967,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6105,7 +6105,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -6243,7 +6243,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6334,7 +6334,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6379,7 +6379,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -6425,7 +6425,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6563,7 +6563,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -6701,7 +6701,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6747,7 +6747,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6838,7 +6838,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6976,7 +6976,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7114,7 +7114,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -7160,7 +7160,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7206,7 +7206,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7252,7 +7252,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7298,7 +7298,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7389,7 +7389,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7434,7 +7434,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -7572,7 +7572,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7710,7 +7710,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -7756,7 +7756,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7847,7 +7847,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -8072,7 +8072,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 70,
+          "end": 69,
           "type": "FULL"
         }
       ]
@@ -8163,7 +8163,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -8208,7 +8208,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -8346,7 +8346,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -8484,7 +8484,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -8530,7 +8530,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/dialogflow/apiv2beta1/snippet_metadata.google.cloud.dialogflow.v2beta1.json b/internal/generated/snippets/dialogflow/apiv2beta1/snippet_metadata.google.cloud.dialogflow.v2beta1.json
index 907599c5230..ef98f0aa800 100644
--- a/internal/generated/snippets/dialogflow/apiv2beta1/snippet_metadata.google.cloud.dialogflow.v2beta1.json
+++ b/internal/generated/snippets/dialogflow/apiv2beta1/snippet_metadata.google.cloud.dialogflow.v2beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dialogflow/apiv2beta1",
-    "version": "1.17.0",
+    "version": "1.18.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/CreateAgent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/CreateAgent/main.go
index 7c08cd55e3b..5f9c312c0e9 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/CreateAgent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/CreateAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateAgentRequest.
 	}
 	resp, err := c.CreateAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/DeleteAgent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/DeleteAgent/main.go
index cc69d5173d2..2db4b3f6e78 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/DeleteAgent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/DeleteAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteAgentRequest.
 	}
 	err = c.DeleteAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ExportAgent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ExportAgent/main.go
index 8441a8baece..749b05b7ecd 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ExportAgent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ExportAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.ExportAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ExportAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ExportAgentRequest.
 	}
 	op, err := c.ExportAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/GetAgent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/GetAgent/main.go
index 1079beb7ed6..2d0d2b43293 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/GetAgent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/GetAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetAgentRequest.
 	}
 	resp, err := c.GetAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/GetAgentValidationResult/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/GetAgentValidationResult/main.go
index 8d548925539..b3559c7783a 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/GetAgentValidationResult/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/GetAgentValidationResult/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetAgentValidationResultRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetAgentValidationResultRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetAgentValidationResultRequest.
 	}
 	resp, err := c.GetAgentValidationResult(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ListAgents/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ListAgents/main.go
index 3cbd21338cf..b725fef1d44 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ListAgents/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ListAgents/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListAgentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListAgentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListAgentsRequest.
 	}
 	it := c.ListAgents(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/RestoreAgent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/RestoreAgent/main.go
index 62a2a15b103..7771632445d 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/RestoreAgent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/RestoreAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.RestoreAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#RestoreAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#RestoreAgentRequest.
 	}
 	op, err := c.RestoreAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/UpdateAgent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/UpdateAgent/main.go
index d076443d0b5..1e719103e73 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/UpdateAgent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/UpdateAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateAgentRequest.
 	}
 	resp, err := c.UpdateAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ValidateAgent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ValidateAgent/main.go
index 13756757cd9..cfb7fabbd98 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ValidateAgent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/AgentsClient/ValidateAgent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.ValidateAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ValidateAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ValidateAgentRequest.
 	}
 	resp, err := c.ValidateAgent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ChangelogsClient/GetChangelog/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ChangelogsClient/GetChangelog/main.go
index fafb2f739a0..7eefeff96a9 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ChangelogsClient/GetChangelog/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ChangelogsClient/GetChangelog/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetChangelogRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetChangelogRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetChangelogRequest.
 	}
 	resp, err := c.GetChangelog(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ChangelogsClient/ListChangelogs/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ChangelogsClient/ListChangelogs/main.go
index c945b35b200..e4a5cb04c71 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ChangelogsClient/ListChangelogs/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ChangelogsClient/ListChangelogs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListChangelogsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListChangelogsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListChangelogsRequest.
 	}
 	it := c.ListChangelogs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/DeploymentsClient/GetDeployment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/DeploymentsClient/GetDeployment/main.go
index b15e1003465..8c9a243aae1 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/DeploymentsClient/GetDeployment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/DeploymentsClient/GetDeployment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetDeploymentRequest.
 	}
 	resp, err := c.GetDeployment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/DeploymentsClient/ListDeployments/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/DeploymentsClient/ListDeployments/main.go
index 1ad15a3a2b5..36c37ca0e5a 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/DeploymentsClient/ListDeployments/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/DeploymentsClient/ListDeployments/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListDeploymentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListDeploymentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListDeploymentsRequest.
 	}
 	it := c.ListDeployments(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/CreateEntityType/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/CreateEntityType/main.go
index 3bbe2f81dfc..0d0f52f95dd 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/CreateEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/CreateEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateEntityTypeRequest.
 	}
 	resp, err := c.CreateEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/DeleteEntityType/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/DeleteEntityType/main.go
index b1ec6fa0b3d..db3ddb6c9fa 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/DeleteEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/DeleteEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteEntityTypeRequest.
 	}
 	err = c.DeleteEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/GetEntityType/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/GetEntityType/main.go
index b269902d54b..931c9ef4c9c 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/GetEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/GetEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetEntityTypeRequest.
 	}
 	resp, err := c.GetEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/ListEntityTypes/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/ListEntityTypes/main.go
index cc42d9ea47c..2209651dbc4 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/ListEntityTypes/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/ListEntityTypes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListEntityTypesRequest.
 	}
 	it := c.ListEntityTypes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/UpdateEntityType/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/UpdateEntityType/main.go
index d1ce9374bd2..2af6a60e753 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/UpdateEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EntityTypesClient/UpdateEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateEntityTypeRequest.
 	}
 	resp, err := c.UpdateEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/CreateEnvironment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/CreateEnvironment/main.go
index 6f03e05fd23..a5386be63b2 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/CreateEnvironment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/CreateEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateEnvironmentRequest.
 	}
 	op, err := c.CreateEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/DeleteEnvironment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/DeleteEnvironment/main.go
index acaddead8f6..1ad667f1b95 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/DeleteEnvironment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/DeleteEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteEnvironmentRequest.
 	}
 	err = c.DeleteEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/DeployFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/DeployFlow/main.go
index 6ceae184871..980162cd40b 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/DeployFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/DeployFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeployFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeployFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeployFlowRequest.
 	}
 	op, err := c.DeployFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/GetEnvironment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/GetEnvironment/main.go
index 7c55cee9bc5..51bf01a4c30 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/GetEnvironment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/GetEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/ListContinuousTestResults/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/ListContinuousTestResults/main.go
index 74ffc27718f..47fa7bbc07a 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/ListContinuousTestResults/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/ListContinuousTestResults/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListContinuousTestResultsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListContinuousTestResultsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListContinuousTestResultsRequest.
 	}
 	it := c.ListContinuousTestResults(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/ListEnvironments/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/ListEnvironments/main.go
index 41972616ccf..437d6e106af 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/ListEnvironments/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/ListEnvironments/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListEnvironmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListEnvironmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListEnvironmentsRequest.
 	}
 	it := c.ListEnvironments(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/LookupEnvironmentHistory/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/LookupEnvironmentHistory/main.go
index 57d78bfaa97..9a9fce98328 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/LookupEnvironmentHistory/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/LookupEnvironmentHistory/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.LookupEnvironmentHistoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#LookupEnvironmentHistoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#LookupEnvironmentHistoryRequest.
 	}
 	it := c.LookupEnvironmentHistory(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/RunContinuousTest/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/RunContinuousTest/main.go
index 5a4143af7ad..a1e320bf957 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/RunContinuousTest/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/RunContinuousTest/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.RunContinuousTestRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#RunContinuousTestRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#RunContinuousTestRequest.
 	}
 	op, err := c.RunContinuousTest(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/UpdateEnvironment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/UpdateEnvironment/main.go
index 96debb318f1..0fe1871f9e3 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/UpdateEnvironment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/EnvironmentsClient/UpdateEnvironment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateEnvironmentRequest.
 	}
 	op, err := c.UpdateEnvironment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/CreateExperiment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/CreateExperiment/main.go
index 9a2f328ee34..dfef6031dbf 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/CreateExperiment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/CreateExperiment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateExperimentRequest.
 	}
 	resp, err := c.CreateExperiment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/DeleteExperiment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/DeleteExperiment/main.go
index b6cefbbb212..4030e0d239e 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/DeleteExperiment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/DeleteExperiment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteExperimentRequest.
 	}
 	err = c.DeleteExperiment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/GetExperiment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/GetExperiment/main.go
index 7dd6cf5cd85..75833c6191a 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/GetExperiment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/GetExperiment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetExperimentRequest.
 	}
 	resp, err := c.GetExperiment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/ListExperiments/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/ListExperiments/main.go
index da248bd4624..f9372ba2da8 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/ListExperiments/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/ListExperiments/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListExperimentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListExperimentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListExperimentsRequest.
 	}
 	it := c.ListExperiments(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/StartExperiment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/StartExperiment/main.go
index 0cfa5e66114..e43d82a8ea3 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/StartExperiment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/StartExperiment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.StartExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#StartExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#StartExperimentRequest.
 	}
 	resp, err := c.StartExperiment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/StopExperiment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/StopExperiment/main.go
index eb60c11e45f..7c15e05394d 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/StopExperiment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/StopExperiment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.StopExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#StopExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#StopExperimentRequest.
 	}
 	resp, err := c.StopExperiment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/UpdateExperiment/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/UpdateExperiment/main.go
index 154c8ea8a44..f2b92f98f0e 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/UpdateExperiment/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/ExperimentsClient/UpdateExperiment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateExperimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateExperimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateExperimentRequest.
 	}
 	resp, err := c.UpdateExperiment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/CreateFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/CreateFlow/main.go
index d750711237a..3fad4d05ac0 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/CreateFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/CreateFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateFlowRequest.
 	}
 	resp, err := c.CreateFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/DeleteFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/DeleteFlow/main.go
index e3bd492be0d..ccb33217a16 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/DeleteFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/DeleteFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteFlowRequest.
 	}
 	err = c.DeleteFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ExportFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ExportFlow/main.go
index 040c1eb723b..420de60a038 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ExportFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ExportFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.ExportFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ExportFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ExportFlowRequest.
 	}
 	op, err := c.ExportFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/GetFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/GetFlow/main.go
index dcc6c976ec3..21f4b58c0bf 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/GetFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/GetFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetFlowRequest.
 	}
 	resp, err := c.GetFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/GetFlowValidationResult/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/GetFlowValidationResult/main.go
index bfc6ef71476..5d7a3a19b2e 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/GetFlowValidationResult/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/GetFlowValidationResult/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetFlowValidationResultRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetFlowValidationResultRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetFlowValidationResultRequest.
 	}
 	resp, err := c.GetFlowValidationResult(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ImportFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ImportFlow/main.go
index ac1485f0ca0..0efd204dd4c 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ImportFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ImportFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.ImportFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ImportFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ImportFlowRequest.
 	}
 	op, err := c.ImportFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ListFlows/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ListFlows/main.go
index 44a18f53997..aeef7e7d906 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ListFlows/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ListFlows/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListFlowsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListFlowsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListFlowsRequest.
 	}
 	it := c.ListFlows(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/TrainFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/TrainFlow/main.go
index c8edcfb807a..9f9cd536cc3 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/TrainFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/TrainFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.TrainFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#TrainFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#TrainFlowRequest.
 	}
 	op, err := c.TrainFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/UpdateFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/UpdateFlow/main.go
index af7fdad58cc..12244b66bf3 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/UpdateFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/UpdateFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateFlowRequest.
 	}
 	resp, err := c.UpdateFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ValidateFlow/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ValidateFlow/main.go
index 385dada2262..735ab47aa16 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ValidateFlow/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/FlowsClient/ValidateFlow/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.ValidateFlowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ValidateFlowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ValidateFlowRequest.
 	}
 	resp, err := c.ValidateFlow(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/CreateIntent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/CreateIntent/main.go
index 8e8b652c270..5524e0a0925 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/CreateIntent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/CreateIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateIntentRequest.
 	}
 	resp, err := c.CreateIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/DeleteIntent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/DeleteIntent/main.go
index b0a4b332cde..3697cbe2928 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/DeleteIntent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/DeleteIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteIntentRequest.
 	}
 	err = c.DeleteIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/GetIntent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/GetIntent/main.go
index 7f245a43eb7..75104b3b86b 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/GetIntent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/GetIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetIntentRequest.
 	}
 	resp, err := c.GetIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/ListIntents/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/ListIntents/main.go
index 60bb17887b1..19a657d6755 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/ListIntents/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/ListIntents/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListIntentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListIntentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListIntentsRequest.
 	}
 	it := c.ListIntents(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/UpdateIntent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/UpdateIntent/main.go
index 24779ef86fe..a8351c834c6 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/UpdateIntent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/IntentsClient/UpdateIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateIntentRequest.
 	}
 	resp, err := c.UpdateIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/CreatePage/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/CreatePage/main.go
index fb6f67c3f85..cf78fc60501 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/CreatePage/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/CreatePage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreatePageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreatePageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreatePageRequest.
 	}
 	resp, err := c.CreatePage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/DeletePage/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/DeletePage/main.go
index f1905f89c18..5ddae4cfc56 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/DeletePage/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/DeletePage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeletePageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeletePageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeletePageRequest.
 	}
 	err = c.DeletePage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/GetPage/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/GetPage/main.go
index 34393e16115..b4e4bb15b07 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/GetPage/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/GetPage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetPageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetPageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetPageRequest.
 	}
 	resp, err := c.GetPage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/ListPages/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/ListPages/main.go
index a5f2b42ea4c..839eca6eebe 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/ListPages/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/ListPages/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListPagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListPagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListPagesRequest.
 	}
 	it := c.ListPages(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/UpdatePage/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/UpdatePage/main.go
index b0af4f2da8c..c7257573078 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/UpdatePage/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/PagesClient/UpdatePage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdatePageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdatePageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdatePageRequest.
 	}
 	resp, err := c.UpdatePage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/CreateSecuritySettings/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/CreateSecuritySettings/main.go
index 0fbc138135c..479fd1a140a 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/CreateSecuritySettings/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/CreateSecuritySettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateSecuritySettingsRequest.
 	}
 	resp, err := c.CreateSecuritySettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/DeleteSecuritySettings/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/DeleteSecuritySettings/main.go
index 9e7c6fbde15..52013937e7e 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/DeleteSecuritySettings/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/DeleteSecuritySettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteSecuritySettingsRequest.
 	}
 	err = c.DeleteSecuritySettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/GetSecuritySettings/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/GetSecuritySettings/main.go
index a84d652613c..f4003fa3a19 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/GetSecuritySettings/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/GetSecuritySettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetSecuritySettingsRequest.
 	}
 	resp, err := c.GetSecuritySettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/ListSecuritySettings/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/ListSecuritySettings/main.go
index e64d5f57c0f..5afddb70831 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/ListSecuritySettings/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/ListSecuritySettings/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListSecuritySettingsRequest.
 	}
 	it := c.ListSecuritySettings(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/UpdateSecuritySettings/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/UpdateSecuritySettings/main.go
index 8be1bb740ad..0b66096aad0 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/UpdateSecuritySettings/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SecuritySettingsClient/UpdateSecuritySettings/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateSecuritySettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateSecuritySettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateSecuritySettingsRequest.
 	}
 	resp, err := c.UpdateSecuritySettings(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/CreateSessionEntityType/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/CreateSessionEntityType/main.go
index 20a310fe536..9f2276988b2 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/CreateSessionEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/CreateSessionEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateSessionEntityTypeRequest.
 	}
 	resp, err := c.CreateSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/DeleteSessionEntityType/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/DeleteSessionEntityType/main.go
index 59cf772c9cd..5e0ffedb962 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/DeleteSessionEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/DeleteSessionEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteSessionEntityTypeRequest.
 	}
 	err = c.DeleteSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/GetSessionEntityType/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/GetSessionEntityType/main.go
index 95de51762b7..07cefd43afa 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/GetSessionEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/GetSessionEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetSessionEntityTypeRequest.
 	}
 	resp, err := c.GetSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/ListSessionEntityTypes/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/ListSessionEntityTypes/main.go
index 01fe3e120be..dc13c9e7ff1 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/ListSessionEntityTypes/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/ListSessionEntityTypes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListSessionEntityTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListSessionEntityTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListSessionEntityTypesRequest.
 	}
 	it := c.ListSessionEntityTypes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/UpdateSessionEntityType/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/UpdateSessionEntityType/main.go
index f395dfc071c..9063b0cd882 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/UpdateSessionEntityType/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionEntityTypesClient/UpdateSessionEntityType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateSessionEntityTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateSessionEntityTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateSessionEntityTypeRequest.
 	}
 	resp, err := c.UpdateSessionEntityType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/DetectIntent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/DetectIntent/main.go
index 82c24d42ffd..f65db5465ae 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/DetectIntent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/DetectIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DetectIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DetectIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DetectIntentRequest.
 	}
 	resp, err := c.DetectIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/FulfillIntent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/FulfillIntent/main.go
index f7353f92ce9..e8739bc843f 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/FulfillIntent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/FulfillIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.FulfillIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#FulfillIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#FulfillIntentRequest.
 	}
 	resp, err := c.FulfillIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/MatchIntent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/MatchIntent/main.go
index 25bc6bf928d..792ea8fe1a4 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/MatchIntent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/MatchIntent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.MatchIntentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#MatchIntentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#MatchIntentRequest.
 	}
 	resp, err := c.MatchIntent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/StreamingDetectIntent/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/StreamingDetectIntent/main.go
index 08735608ef4..b53683313e2 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/StreamingDetectIntent/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/SessionsClient/StreamingDetectIntent/main.go
@@ -23,8 +23,7 @@ import (
 	"io"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/BatchDeleteTestCases/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/BatchDeleteTestCases/main.go
index 66838824482..1864bc57d3d 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/BatchDeleteTestCases/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/BatchDeleteTestCases/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.BatchDeleteTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#BatchDeleteTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#BatchDeleteTestCasesRequest.
 	}
 	err = c.BatchDeleteTestCases(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/BatchRunTestCases/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/BatchRunTestCases/main.go
index 9fddbb39eda..44f33a0d024 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/BatchRunTestCases/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/BatchRunTestCases/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.BatchRunTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#BatchRunTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#BatchRunTestCasesRequest.
 	}
 	op, err := c.BatchRunTestCases(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/CalculateCoverage/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/CalculateCoverage/main.go
index c4fc1b71351..e8de601c9e6 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/CalculateCoverage/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/CalculateCoverage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CalculateCoverageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CalculateCoverageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CalculateCoverageRequest.
 	}
 	resp, err := c.CalculateCoverage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/CreateTestCase/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/CreateTestCase/main.go
index 09519d16dc9..4748132fe09 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/CreateTestCase/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/CreateTestCase/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateTestCaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateTestCaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateTestCaseRequest.
 	}
 	resp, err := c.CreateTestCase(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ExportTestCases/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ExportTestCases/main.go
index 54d18d14c31..545fef38d1b 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ExportTestCases/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ExportTestCases/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.ExportTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ExportTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ExportTestCasesRequest.
 	}
 	op, err := c.ExportTestCases(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/GetTestCase/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/GetTestCase/main.go
index 24f8ae4faa8..1c85c188e76 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/GetTestCase/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/GetTestCase/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetTestCaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetTestCaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetTestCaseRequest.
 	}
 	resp, err := c.GetTestCase(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/GetTestCaseResult/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/GetTestCaseResult/main.go
index 2fcbde2a162..9066f49f4ee 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/GetTestCaseResult/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/GetTestCaseResult/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetTestCaseResultRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetTestCaseResultRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetTestCaseResultRequest.
 	}
 	resp, err := c.GetTestCaseResult(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ImportTestCases/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ImportTestCases/main.go
index 9d1b6b57c47..f7ce2e00b6c 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ImportTestCases/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ImportTestCases/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.ImportTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ImportTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ImportTestCasesRequest.
 	}
 	op, err := c.ImportTestCases(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ListTestCaseResults/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ListTestCaseResults/main.go
index 6f7be98913b..d0e9e6dbf21 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ListTestCaseResults/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ListTestCaseResults/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListTestCaseResultsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListTestCaseResultsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListTestCaseResultsRequest.
 	}
 	it := c.ListTestCaseResults(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ListTestCases/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ListTestCases/main.go
index b5b10f5195f..0394bd303f5 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ListTestCases/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/ListTestCases/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListTestCasesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListTestCasesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListTestCasesRequest.
 	}
 	it := c.ListTestCases(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/RunTestCase/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/RunTestCase/main.go
index db4bd168e17..210876bcf68 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/RunTestCase/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/RunTestCase/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.RunTestCaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#RunTestCaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#RunTestCaseRequest.
 	}
 	op, err := c.RunTestCase(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/UpdateTestCase/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/UpdateTestCase/main.go
index e48a233c7db..cad974dbbc6 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/UpdateTestCase/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TestCasesClient/UpdateTestCase/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateTestCaseRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateTestCaseRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateTestCaseRequest.
 	}
 	resp, err := c.UpdateTestCase(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/CreateTransitionRouteGroup/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/CreateTransitionRouteGroup/main.go
index 46efccf87bf..1adc0d7beca 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/CreateTransitionRouteGroup/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/CreateTransitionRouteGroup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateTransitionRouteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateTransitionRouteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateTransitionRouteGroupRequest.
 	}
 	resp, err := c.CreateTransitionRouteGroup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/DeleteTransitionRouteGroup/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/DeleteTransitionRouteGroup/main.go
index 1eaaa6c78f5..2c04310206e 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/DeleteTransitionRouteGroup/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/DeleteTransitionRouteGroup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteTransitionRouteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteTransitionRouteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteTransitionRouteGroupRequest.
 	}
 	err = c.DeleteTransitionRouteGroup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/GetTransitionRouteGroup/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/GetTransitionRouteGroup/main.go
index 73241ba2593..48f5abb1d4c 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/GetTransitionRouteGroup/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/GetTransitionRouteGroup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetTransitionRouteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetTransitionRouteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetTransitionRouteGroupRequest.
 	}
 	resp, err := c.GetTransitionRouteGroup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/ListTransitionRouteGroups/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/ListTransitionRouteGroups/main.go
index 945f29d46ee..beeda90e093 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/ListTransitionRouteGroups/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/ListTransitionRouteGroups/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListTransitionRouteGroupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListTransitionRouteGroupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListTransitionRouteGroupsRequest.
 	}
 	it := c.ListTransitionRouteGroups(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/UpdateTransitionRouteGroup/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/UpdateTransitionRouteGroup/main.go
index 6d47b75c2f9..1e460a77ab1 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/UpdateTransitionRouteGroup/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/TransitionRouteGroupsClient/UpdateTransitionRouteGroup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateTransitionRouteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateTransitionRouteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateTransitionRouteGroupRequest.
 	}
 	resp, err := c.UpdateTransitionRouteGroup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/CompareVersions/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/CompareVersions/main.go
index 04603c9d81e..76c0edb455b 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/CompareVersions/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/CompareVersions/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CompareVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CompareVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CompareVersionsRequest.
 	}
 	resp, err := c.CompareVersions(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/CreateVersion/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/CreateVersion/main.go
index ad479fbd5b4..c64cadc9bdc 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/CreateVersion/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/CreateVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateVersionRequest.
 	}
 	op, err := c.CreateVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/DeleteVersion/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/DeleteVersion/main.go
index 9b12ea7f062..fd2126f90cb 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/DeleteVersion/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/DeleteVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteVersionRequest.
 	}
 	err = c.DeleteVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/GetVersion/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/GetVersion/main.go
index 612d11fae5c..5a10dafdcd9 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/GetVersion/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/GetVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetVersionRequest.
 	}
 	resp, err := c.GetVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/ListVersions/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/ListVersions/main.go
index 9d2c032d4bf..def8f914296 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/ListVersions/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/ListVersions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListVersionsRequest.
 	}
 	it := c.ListVersions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/LoadVersion/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/LoadVersion/main.go
index dbf186efc3c..91d62de5f3c 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/LoadVersion/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/LoadVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.LoadVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#LoadVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#LoadVersionRequest.
 	}
 	op, err := c.LoadVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/UpdateVersion/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/UpdateVersion/main.go
index b3bf081b1cc..2eba2be99b0 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/UpdateVersion/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/VersionsClient/UpdateVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateVersionRequest.
 	}
 	resp, err := c.UpdateVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/CreateWebhook/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/CreateWebhook/main.go
index 0ada79234b2..fe93b136c6f 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/CreateWebhook/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/CreateWebhook/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.CreateWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#CreateWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#CreateWebhookRequest.
 	}
 	resp, err := c.CreateWebhook(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/DeleteWebhook/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/DeleteWebhook/main.go
index 67a0058274c..3ce7d5faab6 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/DeleteWebhook/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/DeleteWebhook/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.DeleteWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#DeleteWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#DeleteWebhookRequest.
 	}
 	err = c.DeleteWebhook(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/GetWebhook/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/GetWebhook/main.go
index 539f21b5a8d..abea2ccd89a 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/GetWebhook/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/GetWebhook/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.GetWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#GetWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#GetWebhookRequest.
 	}
 	resp, err := c.GetWebhook(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/ListWebhooks/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/ListWebhooks/main.go
index 2898d8677be..4b3fac8c8e4 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/ListWebhooks/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/ListWebhooks/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 	"google.golang.org/api/iterator"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &cxpb.ListWebhooksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#ListWebhooksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#ListWebhooksRequest.
 	}
 	it := c.ListWebhooks(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/UpdateWebhook/main.go b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/UpdateWebhook/main.go
index 27b3d030327..525d2024916 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/UpdateWebhook/main.go
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/WebhooksClient/UpdateWebhook/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	cx "cloud.google.com/go/dialogflow/cx/apiv3"
-
-	cxpb "google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3"
+	cxpb "cloud.google.com/go/dialogflow/cx/apiv3/cxpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &cxpb.UpdateWebhookRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/dialogflow/cx/v3#UpdateWebhookRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dialogflow/cx/apiv3/cxpb#UpdateWebhookRequest.
 	}
 	resp, err := c.UpdateWebhook(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3/snippet_metadata.google.cloud.dialogflow.cx.v3.json b/internal/generated/snippets/dialogflow/cx/apiv3/snippet_metadata.google.cloud.dialogflow.cx.v3.json
index db3a571f6a7..7d8fdf2aa61 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3/snippet_metadata.google.cloud.dialogflow.cx.v3.json
+++ b/internal/generated/snippets/dialogflow/cx/apiv3/snippet_metadata.google.cloud.dialogflow.cx.v3.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dialogflow/cx/apiv3",
-    "version": "1.17.0",
+    "version": "1.18.0",
     "language": "GO",
     "apis": [
       {
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -142,7 +142,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -188,7 +188,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -234,7 +234,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -280,7 +280,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -556,7 +556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -602,7 +602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -648,7 +648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -739,7 +739,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -877,7 +877,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1060,7 +1060,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1198,7 +1198,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1381,7 +1381,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1426,7 +1426,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -1472,7 +1472,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1610,7 +1610,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1748,7 +1748,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1839,7 +1839,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1884,7 +1884,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -1930,7 +1930,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1976,7 +1976,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2114,7 +2114,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2160,7 +2160,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2298,7 +2298,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2344,7 +2344,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -2390,7 +2390,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -2481,7 +2481,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2526,7 +2526,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -2572,7 +2572,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2710,7 +2710,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -2848,7 +2848,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2894,7 +2894,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -2940,7 +2940,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3031,7 +3031,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3076,7 +3076,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -3122,7 +3122,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -3168,7 +3168,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3214,7 +3214,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3352,7 +3352,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -3398,7 +3398,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -3536,7 +3536,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -3582,7 +3582,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3628,7 +3628,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3719,7 +3719,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3764,7 +3764,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -3810,7 +3810,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -3948,7 +3948,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -4086,7 +4086,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4177,7 +4177,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4222,7 +4222,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -4360,7 +4360,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4498,7 +4498,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -4544,7 +4544,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4635,7 +4635,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4680,7 +4680,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -4818,7 +4818,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -4956,7 +4956,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -5002,7 +5002,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5093,7 +5093,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5138,7 +5138,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -5276,7 +5276,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5414,7 +5414,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -5460,7 +5460,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5551,7 +5551,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5597,7 +5597,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5827,7 +5827,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -5868,7 +5868,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 70,
+          "end": 69,
           "type": "FULL"
         }
       ]
@@ -5913,7 +5913,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -5959,7 +5959,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -6005,7 +6005,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6096,7 +6096,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6142,7 +6142,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -6280,7 +6280,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6326,7 +6326,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6372,7 +6372,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -6510,7 +6510,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -6556,7 +6556,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -6602,7 +6602,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -6648,7 +6648,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6739,7 +6739,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -6784,7 +6784,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -6922,7 +6922,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7060,7 +7060,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -7106,7 +7106,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7197,7 +7197,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7243,7 +7243,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -7288,7 +7288,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -7426,7 +7426,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7564,7 +7564,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -7610,7 +7610,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -7656,7 +7656,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7747,7 +7747,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -7792,7 +7792,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -7930,7 +7930,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -8068,7 +8068,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -8114,7 +8114,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/dialogflow/cx/apiv3beta1/snippet_metadata.google.cloud.dialogflow.cx.v3beta1.json b/internal/generated/snippets/dialogflow/cx/apiv3beta1/snippet_metadata.google.cloud.dialogflow.cx.v3beta1.json
index 27671d5e39c..7993c2d2b9e 100644
--- a/internal/generated/snippets/dialogflow/cx/apiv3beta1/snippet_metadata.google.cloud.dialogflow.cx.v3beta1.json
+++ b/internal/generated/snippets/dialogflow/cx/apiv3beta1/snippet_metadata.google.cloud.dialogflow.cx.v3beta1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dialogflow/cx/apiv3beta1",
-    "version": "1.17.0",
+    "version": "1.18.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/ActivateJobTrigger/main.go b/internal/generated/snippets/dlp/apiv2/Client/ActivateJobTrigger/main.go
index 897f7d386e5..d2e8bd9f746 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/ActivateJobTrigger/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/ActivateJobTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.ActivateJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ActivateJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ActivateJobTriggerRequest.
 	}
 	resp, err := c.ActivateJobTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/CancelDlpJob/main.go b/internal/generated/snippets/dlp/apiv2/Client/CancelDlpJob/main.go
index 8bc35e7e087..44449172a71 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/CancelDlpJob/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/CancelDlpJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.CancelDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CancelDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CancelDlpJobRequest.
 	}
 	err = c.CancelDlpJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/CreateDeidentifyTemplate/main.go b/internal/generated/snippets/dlp/apiv2/Client/CreateDeidentifyTemplate/main.go
index 07ec1358df8..94c2128fbb2 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/CreateDeidentifyTemplate/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/CreateDeidentifyTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.CreateDeidentifyTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateDeidentifyTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateDeidentifyTemplateRequest.
 	}
 	resp, err := c.CreateDeidentifyTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/CreateDlpJob/main.go b/internal/generated/snippets/dlp/apiv2/Client/CreateDlpJob/main.go
index 73e2a3dfa72..848bebccf6f 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/CreateDlpJob/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/CreateDlpJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.CreateDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateDlpJobRequest.
 	}
 	resp, err := c.CreateDlpJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/CreateInspectTemplate/main.go b/internal/generated/snippets/dlp/apiv2/Client/CreateInspectTemplate/main.go
index 7861d4a8253..bf6fa2091f2 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/CreateInspectTemplate/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/CreateInspectTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.CreateInspectTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateInspectTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateInspectTemplateRequest.
 	}
 	resp, err := c.CreateInspectTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/CreateJobTrigger/main.go b/internal/generated/snippets/dlp/apiv2/Client/CreateJobTrigger/main.go
index a3e9f9b4031..caaa0467d83 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/CreateJobTrigger/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/CreateJobTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.CreateJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateJobTriggerRequest.
 	}
 	resp, err := c.CreateJobTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/CreateStoredInfoType/main.go b/internal/generated/snippets/dlp/apiv2/Client/CreateStoredInfoType/main.go
index fb18444eaf2..4a7779d7591 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/CreateStoredInfoType/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/CreateStoredInfoType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.CreateStoredInfoTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#CreateStoredInfoTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#CreateStoredInfoTypeRequest.
 	}
 	resp, err := c.CreateStoredInfoType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/DeidentifyContent/main.go b/internal/generated/snippets/dlp/apiv2/Client/DeidentifyContent/main.go
index 4c62937757d..3278b08d9df 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/DeidentifyContent/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/DeidentifyContent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.DeidentifyContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeidentifyContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeidentifyContentRequest.
 	}
 	resp, err := c.DeidentifyContent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/DeleteDeidentifyTemplate/main.go b/internal/generated/snippets/dlp/apiv2/Client/DeleteDeidentifyTemplate/main.go
index 58b886a527b..beaf229f0bb 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/DeleteDeidentifyTemplate/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/DeleteDeidentifyTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.DeleteDeidentifyTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteDeidentifyTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteDeidentifyTemplateRequest.
 	}
 	err = c.DeleteDeidentifyTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/DeleteDlpJob/main.go b/internal/generated/snippets/dlp/apiv2/Client/DeleteDlpJob/main.go
index 9f020641bd7..c1c82fdfe0f 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/DeleteDlpJob/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/DeleteDlpJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.DeleteDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteDlpJobRequest.
 	}
 	err = c.DeleteDlpJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/DeleteInspectTemplate/main.go b/internal/generated/snippets/dlp/apiv2/Client/DeleteInspectTemplate/main.go
index b89a34068dd..9407f04e34c 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/DeleteInspectTemplate/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/DeleteInspectTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.DeleteInspectTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteInspectTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteInspectTemplateRequest.
 	}
 	err = c.DeleteInspectTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/DeleteJobTrigger/main.go b/internal/generated/snippets/dlp/apiv2/Client/DeleteJobTrigger/main.go
index 82a8d1e220e..cad4bdca163 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/DeleteJobTrigger/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/DeleteJobTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.DeleteJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteJobTriggerRequest.
 	}
 	err = c.DeleteJobTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/DeleteStoredInfoType/main.go b/internal/generated/snippets/dlp/apiv2/Client/DeleteStoredInfoType/main.go
index c2e6bb60af2..b59de8ba00a 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/DeleteStoredInfoType/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/DeleteStoredInfoType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.DeleteStoredInfoTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#DeleteStoredInfoTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#DeleteStoredInfoTypeRequest.
 	}
 	err = c.DeleteStoredInfoType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/FinishDlpJob/main.go b/internal/generated/snippets/dlp/apiv2/Client/FinishDlpJob/main.go
index 4308130983b..13667a2f80c 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/FinishDlpJob/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/FinishDlpJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.FinishDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#FinishDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#FinishDlpJobRequest.
 	}
 	err = c.FinishDlpJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/GetDeidentifyTemplate/main.go b/internal/generated/snippets/dlp/apiv2/Client/GetDeidentifyTemplate/main.go
index e478a5cc684..31bcf483023 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/GetDeidentifyTemplate/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/GetDeidentifyTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.GetDeidentifyTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetDeidentifyTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetDeidentifyTemplateRequest.
 	}
 	resp, err := c.GetDeidentifyTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/GetDlpJob/main.go b/internal/generated/snippets/dlp/apiv2/Client/GetDlpJob/main.go
index 79134debe2d..7562bc22163 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/GetDlpJob/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/GetDlpJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.GetDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetDlpJobRequest.
 	}
 	resp, err := c.GetDlpJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/GetInspectTemplate/main.go b/internal/generated/snippets/dlp/apiv2/Client/GetInspectTemplate/main.go
index f4590f6f16b..58bb7d2a7ae 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/GetInspectTemplate/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/GetInspectTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.GetInspectTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetInspectTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetInspectTemplateRequest.
 	}
 	resp, err := c.GetInspectTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/GetJobTrigger/main.go b/internal/generated/snippets/dlp/apiv2/Client/GetJobTrigger/main.go
index a8bef863838..0b3910e3d50 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/GetJobTrigger/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/GetJobTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.GetJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetJobTriggerRequest.
 	}
 	resp, err := c.GetJobTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/GetStoredInfoType/main.go b/internal/generated/snippets/dlp/apiv2/Client/GetStoredInfoType/main.go
index f91cdb58870..0fc262254f1 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/GetStoredInfoType/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/GetStoredInfoType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.GetStoredInfoTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#GetStoredInfoTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#GetStoredInfoTypeRequest.
 	}
 	resp, err := c.GetStoredInfoType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/HybridInspectDlpJob/main.go b/internal/generated/snippets/dlp/apiv2/Client/HybridInspectDlpJob/main.go
index 07f83d9da2f..f9b32f8df0d 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/HybridInspectDlpJob/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/HybridInspectDlpJob/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.HybridInspectDlpJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#HybridInspectDlpJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#HybridInspectDlpJobRequest.
 	}
 	resp, err := c.HybridInspectDlpJob(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/HybridInspectJobTrigger/main.go b/internal/generated/snippets/dlp/apiv2/Client/HybridInspectJobTrigger/main.go
index 2212ca302a1..f6ad939d624 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/HybridInspectJobTrigger/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/HybridInspectJobTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.HybridInspectJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#HybridInspectJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#HybridInspectJobTriggerRequest.
 	}
 	resp, err := c.HybridInspectJobTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/InspectContent/main.go b/internal/generated/snippets/dlp/apiv2/Client/InspectContent/main.go
index 6913bb9c6ca..05587821f57 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/InspectContent/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/InspectContent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.InspectContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#InspectContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#InspectContentRequest.
 	}
 	resp, err := c.InspectContent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/ListDeidentifyTemplates/main.go b/internal/generated/snippets/dlp/apiv2/Client/ListDeidentifyTemplates/main.go
index 03811f63462..0a06c74faad 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/ListDeidentifyTemplates/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/ListDeidentifyTemplates/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 	"google.golang.org/api/iterator"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dlppb.ListDeidentifyTemplatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListDeidentifyTemplatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListDeidentifyTemplatesRequest.
 	}
 	it := c.ListDeidentifyTemplates(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/ListDlpJobs/main.go b/internal/generated/snippets/dlp/apiv2/Client/ListDlpJobs/main.go
index f8e5163ef5b..0c58cf011a3 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/ListDlpJobs/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/ListDlpJobs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 	"google.golang.org/api/iterator"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dlppb.ListDlpJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListDlpJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListDlpJobsRequest.
 	}
 	it := c.ListDlpJobs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/ListInfoTypes/main.go b/internal/generated/snippets/dlp/apiv2/Client/ListInfoTypes/main.go
index ddbadaa619f..1211d93aa91 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/ListInfoTypes/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/ListInfoTypes/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.ListInfoTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListInfoTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListInfoTypesRequest.
 	}
 	resp, err := c.ListInfoTypes(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/ListInspectTemplates/main.go b/internal/generated/snippets/dlp/apiv2/Client/ListInspectTemplates/main.go
index e31d1fcb281..97689efa81d 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/ListInspectTemplates/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/ListInspectTemplates/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 	"google.golang.org/api/iterator"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dlppb.ListInspectTemplatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListInspectTemplatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListInspectTemplatesRequest.
 	}
 	it := c.ListInspectTemplates(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/ListJobTriggers/main.go b/internal/generated/snippets/dlp/apiv2/Client/ListJobTriggers/main.go
index 812c1536883..b2e34dc3c70 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/ListJobTriggers/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/ListJobTriggers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 	"google.golang.org/api/iterator"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dlppb.ListJobTriggersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListJobTriggersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListJobTriggersRequest.
 	}
 	it := c.ListJobTriggers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/ListStoredInfoTypes/main.go b/internal/generated/snippets/dlp/apiv2/Client/ListStoredInfoTypes/main.go
index 37e28ef4100..6384d8f73f3 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/ListStoredInfoTypes/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/ListStoredInfoTypes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 	"google.golang.org/api/iterator"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &dlppb.ListStoredInfoTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ListStoredInfoTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ListStoredInfoTypesRequest.
 	}
 	it := c.ListStoredInfoTypes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/RedactImage/main.go b/internal/generated/snippets/dlp/apiv2/Client/RedactImage/main.go
index bb65827f64e..9c13ffd39f6 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/RedactImage/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/RedactImage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.RedactImageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#RedactImageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#RedactImageRequest.
 	}
 	resp, err := c.RedactImage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/ReidentifyContent/main.go b/internal/generated/snippets/dlp/apiv2/Client/ReidentifyContent/main.go
index 88e48d71ac8..fd262116a4f 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/ReidentifyContent/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/ReidentifyContent/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.ReidentifyContentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#ReidentifyContentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#ReidentifyContentRequest.
 	}
 	resp, err := c.ReidentifyContent(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/UpdateDeidentifyTemplate/main.go b/internal/generated/snippets/dlp/apiv2/Client/UpdateDeidentifyTemplate/main.go
index 68601110f46..ee337bbbd0c 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/UpdateDeidentifyTemplate/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/UpdateDeidentifyTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.UpdateDeidentifyTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#UpdateDeidentifyTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#UpdateDeidentifyTemplateRequest.
 	}
 	resp, err := c.UpdateDeidentifyTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/UpdateInspectTemplate/main.go b/internal/generated/snippets/dlp/apiv2/Client/UpdateInspectTemplate/main.go
index 97b3a94e1e5..8427d7f97e8 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/UpdateInspectTemplate/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/UpdateInspectTemplate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.UpdateInspectTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#UpdateInspectTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#UpdateInspectTemplateRequest.
 	}
 	resp, err := c.UpdateInspectTemplate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/UpdateJobTrigger/main.go b/internal/generated/snippets/dlp/apiv2/Client/UpdateJobTrigger/main.go
index 9fcef7e7a78..53b57d7e1dd 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/UpdateJobTrigger/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/UpdateJobTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.UpdateJobTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#UpdateJobTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#UpdateJobTriggerRequest.
 	}
 	resp, err := c.UpdateJobTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/Client/UpdateStoredInfoType/main.go b/internal/generated/snippets/dlp/apiv2/Client/UpdateStoredInfoType/main.go
index de6896c0010..6de4b8f916e 100644
--- a/internal/generated/snippets/dlp/apiv2/Client/UpdateStoredInfoType/main.go
+++ b/internal/generated/snippets/dlp/apiv2/Client/UpdateStoredInfoType/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	dlp "cloud.google.com/go/dlp/apiv2"
-
-	dlppb "google.golang.org/genproto/googleapis/privacy/dlp/v2"
+	dlppb "cloud.google.com/go/dlp/apiv2/dlppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &dlppb.UpdateStoredInfoTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/privacy/dlp/v2#UpdateStoredInfoTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/dlp/apiv2/dlppb#UpdateStoredInfoTypeRequest.
 	}
 	resp, err := c.UpdateStoredInfoType(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/dlp/apiv2/snippet_metadata.google.privacy.dlp.v2.json b/internal/generated/snippets/dlp/apiv2/snippet_metadata.google.privacy.dlp.v2.json
index 078abd2062b..72d717c7c94 100644
--- a/internal/generated/snippets/dlp/apiv2/snippet_metadata.google.privacy.dlp.v2.json
+++ b/internal/generated/snippets/dlp/apiv2/snippet_metadata.google.privacy.dlp.v2.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/dlp/apiv2",
-    "version": "1.5.1",
+    "version": "1.6.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -97,7 +97,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -418,7 +418,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -463,7 +463,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -508,7 +508,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -553,7 +553,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -598,7 +598,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -643,7 +643,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -689,7 +689,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -735,7 +735,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -781,7 +781,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -827,7 +827,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -873,7 +873,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -919,7 +919,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -965,7 +965,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1011,7 +1011,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1057,7 +1057,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1103,7 +1103,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1149,7 +1149,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1195,7 +1195,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1241,7 +1241,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1287,7 +1287,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1333,7 +1333,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1379,7 +1379,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1425,7 +1425,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1471,7 +1471,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1517,7 +1517,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1563,7 +1563,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/BatchProcessDocuments/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/BatchProcessDocuments/main.go
index 2e5f6ebc2bb..2d5930bda75 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/BatchProcessDocuments/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/BatchProcessDocuments/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.BatchProcessRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#BatchProcessRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#BatchProcessRequest.
 	}
 	op, err := c.BatchProcessDocuments(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/CreateProcessor/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/CreateProcessor/main.go
index 739c1e23369..11c9ffd8865 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/CreateProcessor/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/CreateProcessor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.CreateProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#CreateProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#CreateProcessorRequest.
 	}
 	resp, err := c.CreateProcessor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeleteProcessor/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeleteProcessor/main.go
index 87aed23a7c4..8964a923765 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeleteProcessor/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeleteProcessor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.DeleteProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#DeleteProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#DeleteProcessorRequest.
 	}
 	op, err := c.DeleteProcessor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeleteProcessorVersion/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeleteProcessorVersion/main.go
index 6520ca64270..8ad6736958f 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeleteProcessorVersion/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeleteProcessorVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.DeleteProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#DeleteProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#DeleteProcessorVersionRequest.
 	}
 	op, err := c.DeleteProcessorVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeployProcessorVersion/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeployProcessorVersion/main.go
index dbe58e97c98..f97d2e9e82d 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeployProcessorVersion/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DeployProcessorVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.DeployProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#DeployProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#DeployProcessorVersionRequest.
 	}
 	op, err := c.DeployProcessorVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DisableProcessor/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DisableProcessor/main.go
index 3122ef668d2..93cf655d398 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DisableProcessor/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/DisableProcessor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.DisableProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#DisableProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#DisableProcessorRequest.
 	}
 	op, err := c.DisableProcessor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/EnableProcessor/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/EnableProcessor/main.go
index 23cdc99be3b..ea6ed176cb6 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/EnableProcessor/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/EnableProcessor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.EnableProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#EnableProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#EnableProcessorRequest.
 	}
 	op, err := c.EnableProcessor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/FetchProcessorTypes/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/FetchProcessorTypes/main.go
index 61dcfa9213a..d94e51139e3 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/FetchProcessorTypes/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/FetchProcessorTypes/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.FetchProcessorTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#FetchProcessorTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#FetchProcessorTypesRequest.
 	}
 	resp, err := c.FetchProcessorTypes(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/GetProcessor/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/GetProcessor/main.go
index 7cf5180fa4e..f4b0e57e007 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/GetProcessor/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/GetProcessor/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.GetProcessorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#GetProcessorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#GetProcessorRequest.
 	}
 	resp, err := c.GetProcessor(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/GetProcessorVersion/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/GetProcessorVersion/main.go
index cbfdec109da..295dc330498 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/GetProcessorVersion/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/GetProcessorVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.GetProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#GetProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#GetProcessorVersionRequest.
 	}
 	resp, err := c.GetProcessorVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessorTypes/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessorTypes/main.go
index 812d2cf43f8..21acbbcb1f1 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessorTypes/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessorTypes/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 	"google.golang.org/api/iterator"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &documentaipb.ListProcessorTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ListProcessorTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ListProcessorTypesRequest.
 	}
 	it := c.ListProcessorTypes(ctx, req)
 	for {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessorVersions/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessorVersions/main.go
index 228092ca063..1e94c135282 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessorVersions/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessorVersions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 	"google.golang.org/api/iterator"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &documentaipb.ListProcessorVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ListProcessorVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ListProcessorVersionsRequest.
 	}
 	it := c.ListProcessorVersions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessors/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessors/main.go
index 86acba0f2e0..80b416964a7 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessors/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ListProcessors/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 	"google.golang.org/api/iterator"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &documentaipb.ListProcessorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ListProcessorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ListProcessorsRequest.
 	}
 	it := c.ListProcessors(ctx, req)
 	for {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ProcessDocument/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ProcessDocument/main.go
index 1d1e16ac1a9..381a1c4b12c 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ProcessDocument/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ProcessDocument/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.ProcessRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ProcessRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ProcessRequest.
 	}
 	resp, err := c.ProcessDocument(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ReviewDocument/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ReviewDocument/main.go
index b6a9e5e667f..20413b509ec 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ReviewDocument/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/ReviewDocument/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.ReviewDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#ReviewDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#ReviewDocumentRequest.
 	}
 	op, err := c.ReviewDocument(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/SetDefaultProcessorVersion/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/SetDefaultProcessorVersion/main.go
index 479b24b8110..f0c3c3a04d5 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/SetDefaultProcessorVersion/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/SetDefaultProcessorVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.SetDefaultProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#SetDefaultProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#SetDefaultProcessorVersionRequest.
 	}
 	op, err := c.SetDefaultProcessorVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/UndeployProcessorVersion/main.go b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/UndeployProcessorVersion/main.go
index 66e9ebc521c..3026f653a2d 100644
--- a/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/UndeployProcessorVersion/main.go
+++ b/internal/generated/snippets/documentai/apiv1/DocumentProcessorClient/UndeployProcessorVersion/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	documentai "cloud.google.com/go/documentai/apiv1"
-
-	documentaipb "google.golang.org/genproto/googleapis/cloud/documentai/v1"
+	documentaipb "cloud.google.com/go/documentai/apiv1/documentaipb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &documentaipb.UndeployProcessorVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/documentai/v1#UndeployProcessorVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/documentai/apiv1/documentaipb#UndeployProcessorVersionRequest.
 	}
 	op, err := c.UndeployProcessorVersion(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/documentai/apiv1/snippet_metadata.google.cloud.documentai.v1.json b/internal/generated/snippets/documentai/apiv1/snippet_metadata.google.cloud.documentai.v1.json
index 2f5ecf99c3c..94ee1364eb1 100644
--- a/internal/generated/snippets/documentai/apiv1/snippet_metadata.google.cloud.documentai.v1.json
+++ b/internal/generated/snippets/documentai/apiv1/snippet_metadata.google.cloud.documentai.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/documentai/apiv1",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -281,7 +281,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -327,7 +327,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -373,7 +373,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -419,7 +419,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -557,7 +557,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -603,7 +603,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -741,7 +741,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -787,7 +787,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -833,7 +833,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -879,7 +879,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -925,7 +925,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -971,7 +971,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1017,7 +1017,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/documentai/apiv1beta3/snippet_metadata.google.cloud.documentai.v1beta3.json b/internal/generated/snippets/documentai/apiv1beta3/snippet_metadata.google.cloud.documentai.v1beta3.json
index 021e2aeb6a8..17e6c9af003 100644
--- a/internal/generated/snippets/documentai/apiv1beta3/snippet_metadata.google.cloud.documentai.v1beta3.json
+++ b/internal/generated/snippets/documentai/apiv1beta3/snippet_metadata.google.cloud.documentai.v1beta3.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/documentai/apiv1beta3",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/essentialcontacts/apiv1/Client/ComputeContacts/main.go b/internal/generated/snippets/essentialcontacts/apiv1/Client/ComputeContacts/main.go
index a7bfdff3147..520f3f06873 100644
--- a/internal/generated/snippets/essentialcontacts/apiv1/Client/ComputeContacts/main.go
+++ b/internal/generated/snippets/essentialcontacts/apiv1/Client/ComputeContacts/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	essentialcontacts "cloud.google.com/go/essentialcontacts/apiv1"
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 	"google.golang.org/api/iterator"
-
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &essentialcontactspb.ComputeContactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#ComputeContactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#ComputeContactsRequest.
 	}
 	it := c.ComputeContacts(ctx, req)
 	for {
diff --git a/internal/generated/snippets/essentialcontacts/apiv1/Client/CreateContact/main.go b/internal/generated/snippets/essentialcontacts/apiv1/Client/CreateContact/main.go
index 2f843a39d04..44ef3b4053b 100644
--- a/internal/generated/snippets/essentialcontacts/apiv1/Client/CreateContact/main.go
+++ b/internal/generated/snippets/essentialcontacts/apiv1/Client/CreateContact/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	essentialcontacts "cloud.google.com/go/essentialcontacts/apiv1"
-
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &essentialcontactspb.CreateContactRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#CreateContactRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#CreateContactRequest.
 	}
 	resp, err := c.CreateContact(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/essentialcontacts/apiv1/Client/DeleteContact/main.go b/internal/generated/snippets/essentialcontacts/apiv1/Client/DeleteContact/main.go
index 9152183e68e..1421b6b36f8 100644
--- a/internal/generated/snippets/essentialcontacts/apiv1/Client/DeleteContact/main.go
+++ b/internal/generated/snippets/essentialcontacts/apiv1/Client/DeleteContact/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	essentialcontacts "cloud.google.com/go/essentialcontacts/apiv1"
-
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &essentialcontactspb.DeleteContactRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#DeleteContactRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#DeleteContactRequest.
 	}
 	err = c.DeleteContact(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/essentialcontacts/apiv1/Client/GetContact/main.go b/internal/generated/snippets/essentialcontacts/apiv1/Client/GetContact/main.go
index bc87640e9a7..3b7d14f7325 100644
--- a/internal/generated/snippets/essentialcontacts/apiv1/Client/GetContact/main.go
+++ b/internal/generated/snippets/essentialcontacts/apiv1/Client/GetContact/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	essentialcontacts "cloud.google.com/go/essentialcontacts/apiv1"
-
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &essentialcontactspb.GetContactRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#GetContactRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#GetContactRequest.
 	}
 	resp, err := c.GetContact(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/essentialcontacts/apiv1/Client/ListContacts/main.go b/internal/generated/snippets/essentialcontacts/apiv1/Client/ListContacts/main.go
index b70ed558a08..f466ba9af63 100644
--- a/internal/generated/snippets/essentialcontacts/apiv1/Client/ListContacts/main.go
+++ b/internal/generated/snippets/essentialcontacts/apiv1/Client/ListContacts/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	essentialcontacts "cloud.google.com/go/essentialcontacts/apiv1"
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 	"google.golang.org/api/iterator"
-
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &essentialcontactspb.ListContactsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#ListContactsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#ListContactsRequest.
 	}
 	it := c.ListContacts(ctx, req)
 	for {
diff --git a/internal/generated/snippets/essentialcontacts/apiv1/Client/SendTestMessage/main.go b/internal/generated/snippets/essentialcontacts/apiv1/Client/SendTestMessage/main.go
index 764ba909e94..21caae54f48 100644
--- a/internal/generated/snippets/essentialcontacts/apiv1/Client/SendTestMessage/main.go
+++ b/internal/generated/snippets/essentialcontacts/apiv1/Client/SendTestMessage/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	essentialcontacts "cloud.google.com/go/essentialcontacts/apiv1"
-
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &essentialcontactspb.SendTestMessageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#SendTestMessageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#SendTestMessageRequest.
 	}
 	err = c.SendTestMessage(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/essentialcontacts/apiv1/Client/UpdateContact/main.go b/internal/generated/snippets/essentialcontacts/apiv1/Client/UpdateContact/main.go
index 88b4d81a488..2992106f11e 100644
--- a/internal/generated/snippets/essentialcontacts/apiv1/Client/UpdateContact/main.go
+++ b/internal/generated/snippets/essentialcontacts/apiv1/Client/UpdateContact/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	essentialcontacts "cloud.google.com/go/essentialcontacts/apiv1"
-
-	essentialcontactspb "google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1"
+	essentialcontactspb "cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &essentialcontactspb.UpdateContactRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/essentialcontacts/v1#UpdateContactRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/essentialcontacts/apiv1/essentialcontactspb#UpdateContactRequest.
 	}
 	resp, err := c.UpdateContact(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/essentialcontacts/apiv1/snippet_metadata.google.cloud.essentialcontacts.v1.json b/internal/generated/snippets/essentialcontacts/apiv1/snippet_metadata.google.cloud.essentialcontacts.v1.json
index e0398bfe536..8edb14437c6 100644
--- a/internal/generated/snippets/essentialcontacts/apiv1/snippet_metadata.google.cloud.essentialcontacts.v1.json
+++ b/internal/generated/snippets/essentialcontacts/apiv1/snippet_metadata.google.cloud.essentialcontacts.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/essentialcontacts/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -143,7 +143,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -189,7 +189,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -235,7 +235,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -280,7 +280,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 52,
+          "end": 51,
           "type": "FULL"
         }
       ]
@@ -326,7 +326,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/CreateChannel/main.go b/internal/generated/snippets/eventarc/apiv1/Client/CreateChannel/main.go
index 2f8f4043327..08be05d9a99 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/CreateChannel/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/CreateChannel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.CreateChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#CreateChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#CreateChannelRequest.
 	}
 	op, err := c.CreateChannel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/CreateChannelConnection/main.go b/internal/generated/snippets/eventarc/apiv1/Client/CreateChannelConnection/main.go
index f29f6c5bc6a..bd9649d662e 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/CreateChannelConnection/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/CreateChannelConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.CreateChannelConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#CreateChannelConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#CreateChannelConnectionRequest.
 	}
 	op, err := c.CreateChannelConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/CreateTrigger/main.go b/internal/generated/snippets/eventarc/apiv1/Client/CreateTrigger/main.go
index fe0753e4245..13ed3063948 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/CreateTrigger/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/CreateTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.CreateTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#CreateTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#CreateTriggerRequest.
 	}
 	op, err := c.CreateTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/DeleteChannel/main.go b/internal/generated/snippets/eventarc/apiv1/Client/DeleteChannel/main.go
index 247aeeb27dd..e60980fc926 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/DeleteChannel/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/DeleteChannel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.DeleteChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#DeleteChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#DeleteChannelRequest.
 	}
 	op, err := c.DeleteChannel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/DeleteChannelConnection/main.go b/internal/generated/snippets/eventarc/apiv1/Client/DeleteChannelConnection/main.go
index 4178f7c8de2..9e77a1f7ddc 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/DeleteChannelConnection/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/DeleteChannelConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.DeleteChannelConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#DeleteChannelConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#DeleteChannelConnectionRequest.
 	}
 	op, err := c.DeleteChannelConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/DeleteTrigger/main.go b/internal/generated/snippets/eventarc/apiv1/Client/DeleteTrigger/main.go
index 2475760a715..849330fec6d 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/DeleteTrigger/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/DeleteTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.DeleteTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#DeleteTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#DeleteTriggerRequest.
 	}
 	op, err := c.DeleteTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/GetChannel/main.go b/internal/generated/snippets/eventarc/apiv1/Client/GetChannel/main.go
index ae0c103bcff..613139aa7ef 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/GetChannel/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/GetChannel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.GetChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetChannelRequest.
 	}
 	resp, err := c.GetChannel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/GetChannelConnection/main.go b/internal/generated/snippets/eventarc/apiv1/Client/GetChannelConnection/main.go
index c313eb80a89..5f98e1dd5cc 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/GetChannelConnection/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/GetChannelConnection/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.GetChannelConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetChannelConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetChannelConnectionRequest.
 	}
 	resp, err := c.GetChannelConnection(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/GetProvider/main.go b/internal/generated/snippets/eventarc/apiv1/Client/GetProvider/main.go
index 1ecbc71b01a..08d6ef2642c 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/GetProvider/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/GetProvider/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.GetProviderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetProviderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetProviderRequest.
 	}
 	resp, err := c.GetProvider(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/GetTrigger/main.go b/internal/generated/snippets/eventarc/apiv1/Client/GetTrigger/main.go
index 29fbafc7096..e49097f8ea4 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/GetTrigger/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/GetTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.GetTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#GetTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#GetTriggerRequest.
 	}
 	resp, err := c.GetTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/ListChannelConnections/main.go b/internal/generated/snippets/eventarc/apiv1/Client/ListChannelConnections/main.go
index 1e56ac5c669..68bfdf607d1 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/ListChannelConnections/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/ListChannelConnections/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 	"google.golang.org/api/iterator"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &eventarcpb.ListChannelConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#ListChannelConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#ListChannelConnectionsRequest.
 	}
 	it := c.ListChannelConnections(ctx, req)
 	for {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/ListChannels/main.go b/internal/generated/snippets/eventarc/apiv1/Client/ListChannels/main.go
index 86a1fb2e0a5..36834435029 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/ListChannels/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/ListChannels/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 	"google.golang.org/api/iterator"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &eventarcpb.ListChannelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#ListChannelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#ListChannelsRequest.
 	}
 	it := c.ListChannels(ctx, req)
 	for {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/ListProviders/main.go b/internal/generated/snippets/eventarc/apiv1/Client/ListProviders/main.go
index edc355fe4c9..26ac828aaf7 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/ListProviders/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/ListProviders/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 	"google.golang.org/api/iterator"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &eventarcpb.ListProvidersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#ListProvidersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#ListProvidersRequest.
 	}
 	it := c.ListProviders(ctx, req)
 	for {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/ListTriggers/main.go b/internal/generated/snippets/eventarc/apiv1/Client/ListTriggers/main.go
index e0df1256533..516a09f051e 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/ListTriggers/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/ListTriggers/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 	"google.golang.org/api/iterator"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &eventarcpb.ListTriggersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#ListTriggersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#ListTriggersRequest.
 	}
 	it := c.ListTriggers(ctx, req)
 	for {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/UpdateChannel/main.go b/internal/generated/snippets/eventarc/apiv1/Client/UpdateChannel/main.go
index 2d7244603e1..228fc1c4ae9 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/UpdateChannel/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/UpdateChannel/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.UpdateChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#UpdateChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#UpdateChannelRequest.
 	}
 	op, err := c.UpdateChannel(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/Client/UpdateTrigger/main.go b/internal/generated/snippets/eventarc/apiv1/Client/UpdateTrigger/main.go
index c83dc31b9ac..8c696677884 100644
--- a/internal/generated/snippets/eventarc/apiv1/Client/UpdateTrigger/main.go
+++ b/internal/generated/snippets/eventarc/apiv1/Client/UpdateTrigger/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	eventarc "cloud.google.com/go/eventarc/apiv1"
-
-	eventarcpb "google.golang.org/genproto/googleapis/cloud/eventarc/v1"
+	eventarcpb "cloud.google.com/go/eventarc/apiv1/eventarcpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &eventarcpb.UpdateTriggerRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/v1#UpdateTriggerRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/apiv1/eventarcpb#UpdateTriggerRequest.
 	}
 	op, err := c.UpdateTrigger(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/apiv1/snippet_metadata.google.cloud.eventarc.v1.json b/internal/generated/snippets/eventarc/apiv1/snippet_metadata.google.cloud.eventarc.v1.json
index d22777847a4..207e9f5e338 100644
--- a/internal/generated/snippets/eventarc/apiv1/snippet_metadata.google.cloud.eventarc.v1.json
+++ b/internal/generated/snippets/eventarc/apiv1/snippet_metadata.google.cloud.eventarc.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/eventarc/apiv1",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -742,7 +742,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/eventarc/publishing/apiv1/PublisherClient/PublishChannelConnectionEvents/main.go b/internal/generated/snippets/eventarc/publishing/apiv1/PublisherClient/PublishChannelConnectionEvents/main.go
index a0eb251e558..fd101200d6c 100644
--- a/internal/generated/snippets/eventarc/publishing/apiv1/PublisherClient/PublishChannelConnectionEvents/main.go
+++ b/internal/generated/snippets/eventarc/publishing/apiv1/PublisherClient/PublishChannelConnectionEvents/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	publishing "cloud.google.com/go/eventarc/publishing/apiv1"
-	publisherpb "google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1"
+	publishingpb "cloud.google.com/go/eventarc/publishing/apiv1/publishingpb"
 )
 
 func main() {
@@ -38,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &publisherpb.PublishChannelConnectionEventsRequest{
+	req := &publishingpb.PublishChannelConnectionEventsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1#PublishChannelConnectionEventsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/publishing/apiv1/publishingpb#PublishChannelConnectionEventsRequest.
 	}
 	resp, err := c.PublishChannelConnectionEvents(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/publishing/apiv1/PublisherClient/PublishEvents/main.go b/internal/generated/snippets/eventarc/publishing/apiv1/PublisherClient/PublishEvents/main.go
index a3f010fa170..6ee0bec7c2d 100644
--- a/internal/generated/snippets/eventarc/publishing/apiv1/PublisherClient/PublishEvents/main.go
+++ b/internal/generated/snippets/eventarc/publishing/apiv1/PublisherClient/PublishEvents/main.go
@@ -22,7 +22,7 @@ import (
 	"context"
 
 	publishing "cloud.google.com/go/eventarc/publishing/apiv1"
-	publisherpb "google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1"
+	publishingpb "cloud.google.com/go/eventarc/publishing/apiv1/publishingpb"
 )
 
 func main() {
@@ -38,9 +38,9 @@ func main() {
 	}
 	defer c.Close()
 
-	req := &publisherpb.PublishEventsRequest{
+	req := &publishingpb.PublishEventsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/eventarc/publishing/v1#PublishEventsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/eventarc/publishing/apiv1/publishingpb#PublishEventsRequest.
 	}
 	resp, err := c.PublishEvents(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/eventarc/publishing/apiv1/snippet_metadata.google.cloud.eventarc.publishing.v1.json b/internal/generated/snippets/eventarc/publishing/apiv1/snippet_metadata.google.cloud.eventarc.publishing.v1.json
index a9eb9d5970e..721a46bdd1d 100644
--- a/internal/generated/snippets/eventarc/publishing/apiv1/snippet_metadata.google.cloud.eventarc.publishing.v1.json
+++ b/internal/generated/snippets/eventarc/publishing/apiv1/snippet_metadata.google.cloud.eventarc.publishing.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/eventarc/publishing/apiv1",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
@@ -26,7 +26,7 @@
             "name": "ctx"
           },
           {
-            "type": "publisherpb.PublishChannelConnectionEventsRequest",
+            "type": "publishingpb.PublishChannelConnectionEventsRequest",
             "name": "req"
           },
           {
@@ -34,7 +34,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "publisherpb.PublishChannelConnectionEventsResponse",
+        "resultType": "publishingpb.PublishChannelConnectionEventsResponse",
         "client": {
           "shortName": "PublisherClient",
           "fullName": "google.cloud.eventarc.publishing.v1.PublisherClient"
@@ -72,7 +72,7 @@
             "name": "ctx"
           },
           {
-            "type": "publisherpb.PublishEventsRequest",
+            "type": "publishingpb.PublishEventsRequest",
             "name": "req"
           },
           {
@@ -80,7 +80,7 @@
             "name": "opts"
           }
         ],
-        "resultType": "publisherpb.PublishEventsResponse",
+        "resultType": "publishingpb.PublishEventsResponse",
         "client": {
           "shortName": "PublisherClient",
           "fullName": "google.cloud.eventarc.publishing.v1.PublisherClient"
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/CreateBackup/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/CreateBackup/main.go
index e1c0aaa6e29..3132a0fab98 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/CreateBackup/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/CreateBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.CreateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#CreateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#CreateBackupRequest.
 	}
 	op, err := c.CreateBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/CreateInstance/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/CreateInstance/main.go
index ac55beda098..da3da33ff3a 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/CreateInstance/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/CreateInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.CreateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#CreateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#CreateInstanceRequest.
 	}
 	op, err := c.CreateInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/DeleteBackup/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/DeleteBackup/main.go
index 71160cef7b3..e5677eef217 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/DeleteBackup/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/DeleteBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.DeleteBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#DeleteBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#DeleteBackupRequest.
 	}
 	op, err := c.DeleteBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/DeleteInstance/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/DeleteInstance/main.go
index 7b2e776b68a..6e845491bd6 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/DeleteInstance/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/DeleteInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/GetBackup/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/GetBackup/main.go
index ff2874c1bc2..d129d68052c 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/GetBackup/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/GetBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.GetBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#GetBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#GetBackupRequest.
 	}
 	resp, err := c.GetBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/GetInstance/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/GetInstance/main.go
index 281de615760..dc33f405b52 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/GetInstance/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/GetInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/ListBackups/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/ListBackups/main.go
index a0370d4087c..830eec25175 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/ListBackups/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/ListBackups/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 	"google.golang.org/api/iterator"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &filestorepb.ListBackupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#ListBackupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#ListBackupsRequest.
 	}
 	it := c.ListBackups(ctx, req)
 	for {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/ListInstances/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/ListInstances/main.go
index 0fd4adab4ef..b91e613a054 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/ListInstances/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/ListInstances/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 	"google.golang.org/api/iterator"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &filestorepb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/RestoreInstance/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/RestoreInstance/main.go
index e3c868b1c11..998e84d592d 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/RestoreInstance/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/RestoreInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.RestoreInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#RestoreInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#RestoreInstanceRequest.
 	}
 	op, err := c.RestoreInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/UpdateBackup/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/UpdateBackup/main.go
index 63c2ca61647..f0dae7ffd39 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/UpdateBackup/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/UpdateBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.UpdateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#UpdateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#UpdateBackupRequest.
 	}
 	op, err := c.UpdateBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/UpdateInstance/main.go b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/UpdateInstance/main.go
index 2c24feac0dc..662b62668d2 100644
--- a/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/UpdateInstance/main.go
+++ b/internal/generated/snippets/filestore/apiv1/CloudFilestoreManagerClient/UpdateInstance/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	filestore "cloud.google.com/go/filestore/apiv1"
-
-	filestorepb "google.golang.org/genproto/googleapis/cloud/filestore/v1"
+	filestorepb "cloud.google.com/go/filestore/apiv1/filestorepb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &filestorepb.UpdateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/filestore/v1#UpdateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/filestore/apiv1/filestorepb#UpdateInstanceRequest.
 	}
 	op, err := c.UpdateInstance(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/filestore/apiv1/snippet_metadata.google.cloud.filestore.v1.json b/internal/generated/snippets/filestore/apiv1/snippet_metadata.google.cloud.filestore.v1.json
index 95a8ea09afc..ee81029c8bd 100644
--- a/internal/generated/snippets/filestore/apiv1/snippet_metadata.google.cloud.filestore.v1.json
+++ b/internal/generated/snippets/filestore/apiv1/snippet_metadata.google.cloud.filestore.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/filestore/apiv1",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/CallFunction/main.go b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/CallFunction/main.go
index e764b29c719..5e9616722b4 100644
--- a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/CallFunction/main.go
+++ b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/CallFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.CallFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#CallFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#CallFunctionRequest.
 	}
 	resp, err := c.CallFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/CreateFunction/main.go b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/CreateFunction/main.go
index 311d1257028..f35a7fcbac8 100644
--- a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/CreateFunction/main.go
+++ b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/CreateFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.CreateFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#CreateFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#CreateFunctionRequest.
 	}
 	op, err := c.CreateFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/DeleteFunction/main.go b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/DeleteFunction/main.go
index cd2ff5bc6c2..33e42d1eabb 100644
--- a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/DeleteFunction/main.go
+++ b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/DeleteFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.DeleteFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#DeleteFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#DeleteFunctionRequest.
 	}
 	op, err := c.DeleteFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GenerateDownloadUrl/main.go b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GenerateDownloadUrl/main.go
index c1bac2d12da..ea2d938bb72 100644
--- a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GenerateDownloadUrl/main.go
+++ b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GenerateDownloadUrl/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.GenerateDownloadUrlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#GenerateDownloadUrlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#GenerateDownloadUrlRequest.
 	}
 	resp, err := c.GenerateDownloadUrl(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GenerateUploadUrl/main.go b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GenerateUploadUrl/main.go
index e87d5487ea3..ac88368b6f2 100644
--- a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GenerateUploadUrl/main.go
+++ b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GenerateUploadUrl/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.GenerateUploadUrlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#GenerateUploadUrlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#GenerateUploadUrlRequest.
 	}
 	resp, err := c.GenerateUploadUrl(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GetFunction/main.go b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GetFunction/main.go
index 42fea997bb5..3fb344dbd2d 100644
--- a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GetFunction/main.go
+++ b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/GetFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.GetFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#GetFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#GetFunctionRequest.
 	}
 	resp, err := c.GetFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/ListFunctions/main.go b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/ListFunctions/main.go
index ad4ad38f963..f0cbe8b8ace 100644
--- a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/ListFunctions/main.go
+++ b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/ListFunctions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 	"google.golang.org/api/iterator"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &functionspb.ListFunctionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#ListFunctionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#ListFunctionsRequest.
 	}
 	it := c.ListFunctions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/UpdateFunction/main.go b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/UpdateFunction/main.go
index 8fa3c12fe8c..df23b6ce5a5 100644
--- a/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/UpdateFunction/main.go
+++ b/internal/generated/snippets/functions/apiv1/CloudFunctionsClient/UpdateFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv1"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v1"
+	functionspb "cloud.google.com/go/functions/apiv1/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.UpdateFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v1#UpdateFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv1/functionspb#UpdateFunctionRequest.
 	}
 	op, err := c.UpdateFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv1/snippet_metadata.google.cloud.functions.v1.json b/internal/generated/snippets/functions/apiv1/snippet_metadata.google.cloud.functions.v1.json
index 0fccb011df0..a647ef3b61b 100644
--- a/internal/generated/snippets/functions/apiv1/snippet_metadata.google.cloud.functions.v1.json
+++ b/internal/generated/snippets/functions/apiv1/snippet_metadata.google.cloud.functions.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/functions/apiv1",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/functions/apiv2/FunctionClient/CreateFunction/main.go b/internal/generated/snippets/functions/apiv2/FunctionClient/CreateFunction/main.go
index b604c4d21e4..43d1f01593d 100644
--- a/internal/generated/snippets/functions/apiv2/FunctionClient/CreateFunction/main.go
+++ b/internal/generated/snippets/functions/apiv2/FunctionClient/CreateFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.CreateFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#CreateFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#CreateFunctionRequest.
 	}
 	op, err := c.CreateFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv2/FunctionClient/DeleteFunction/main.go b/internal/generated/snippets/functions/apiv2/FunctionClient/DeleteFunction/main.go
index 2578a4ccd0b..4e009e446d3 100644
--- a/internal/generated/snippets/functions/apiv2/FunctionClient/DeleteFunction/main.go
+++ b/internal/generated/snippets/functions/apiv2/FunctionClient/DeleteFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.DeleteFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#DeleteFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#DeleteFunctionRequest.
 	}
 	op, err := c.DeleteFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv2/FunctionClient/GenerateDownloadUrl/main.go b/internal/generated/snippets/functions/apiv2/FunctionClient/GenerateDownloadUrl/main.go
index 8c2d9507296..4689d6afab8 100644
--- a/internal/generated/snippets/functions/apiv2/FunctionClient/GenerateDownloadUrl/main.go
+++ b/internal/generated/snippets/functions/apiv2/FunctionClient/GenerateDownloadUrl/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.GenerateDownloadUrlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#GenerateDownloadUrlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#GenerateDownloadUrlRequest.
 	}
 	resp, err := c.GenerateDownloadUrl(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv2/FunctionClient/GenerateUploadUrl/main.go b/internal/generated/snippets/functions/apiv2/FunctionClient/GenerateUploadUrl/main.go
index fd8bc70ad7e..f68dc282041 100644
--- a/internal/generated/snippets/functions/apiv2/FunctionClient/GenerateUploadUrl/main.go
+++ b/internal/generated/snippets/functions/apiv2/FunctionClient/GenerateUploadUrl/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.GenerateUploadUrlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#GenerateUploadUrlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#GenerateUploadUrlRequest.
 	}
 	resp, err := c.GenerateUploadUrl(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv2/FunctionClient/GetFunction/main.go b/internal/generated/snippets/functions/apiv2/FunctionClient/GetFunction/main.go
index 1f5a9cbfc89..ba8007f1ac1 100644
--- a/internal/generated/snippets/functions/apiv2/FunctionClient/GetFunction/main.go
+++ b/internal/generated/snippets/functions/apiv2/FunctionClient/GetFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.GetFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#GetFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#GetFunctionRequest.
 	}
 	resp, err := c.GetFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv2/FunctionClient/ListFunctions/main.go b/internal/generated/snippets/functions/apiv2/FunctionClient/ListFunctions/main.go
index 2e6be78073a..53366075020 100644
--- a/internal/generated/snippets/functions/apiv2/FunctionClient/ListFunctions/main.go
+++ b/internal/generated/snippets/functions/apiv2/FunctionClient/ListFunctions/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 	"google.golang.org/api/iterator"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &functionspb.ListFunctionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#ListFunctionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#ListFunctionsRequest.
 	}
 	it := c.ListFunctions(ctx, req)
 	for {
diff --git a/internal/generated/snippets/functions/apiv2/FunctionClient/ListRuntimes/main.go b/internal/generated/snippets/functions/apiv2/FunctionClient/ListRuntimes/main.go
index 9d3eb4fabe7..0b7e0bcbb92 100644
--- a/internal/generated/snippets/functions/apiv2/FunctionClient/ListRuntimes/main.go
+++ b/internal/generated/snippets/functions/apiv2/FunctionClient/ListRuntimes/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.ListRuntimesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#ListRuntimesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#ListRuntimesRequest.
 	}
 	resp, err := c.ListRuntimes(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv2/FunctionClient/UpdateFunction/main.go b/internal/generated/snippets/functions/apiv2/FunctionClient/UpdateFunction/main.go
index ed89686f8df..9d637b3f04a 100644
--- a/internal/generated/snippets/functions/apiv2/FunctionClient/UpdateFunction/main.go
+++ b/internal/generated/snippets/functions/apiv2/FunctionClient/UpdateFunction/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	functions "cloud.google.com/go/functions/apiv2"
-
-	functionspb "google.golang.org/genproto/googleapis/cloud/functions/v2"
+	functionspb "cloud.google.com/go/functions/apiv2/functionspb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &functionspb.UpdateFunctionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/functions/v2#UpdateFunctionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/functions/apiv2/functionspb#UpdateFunctionRequest.
 	}
 	op, err := c.UpdateFunction(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/functions/apiv2/snippet_metadata.google.cloud.functions.v2.json b/internal/generated/snippets/functions/apiv2/snippet_metadata.google.cloud.functions.v2.json
index 1efd7d6d75b..68188b63de1 100644
--- a/internal/generated/snippets/functions/apiv2/snippet_metadata.google.cloud.functions.v2.json
+++ b/internal/generated/snippets/functions/apiv2/snippet_metadata.google.cloud.functions.v2.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/functions/apiv2",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/functions/apiv2beta/snippet_metadata.google.cloud.functions.v2beta.json b/internal/generated/snippets/functions/apiv2beta/snippet_metadata.google.cloud.functions.v2beta.json
index 94377da7f8b..0ac2c41e455 100644
--- a/internal/generated/snippets/functions/apiv2beta/snippet_metadata.google.cloud.functions.v2beta.json
+++ b/internal/generated/snippets/functions/apiv2beta/snippet_metadata.google.cloud.functions.v2beta.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/functions/apiv2beta",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/CreateGameServerCluster/main.go b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/CreateGameServerCluster/main.go
index 1f36d49e46a..4bd46d20176 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/CreateGameServerCluster/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/CreateGameServerCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.CreateGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#CreateGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#CreateGameServerClusterRequest.
 	}
 	op, err := c.CreateGameServerCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/DeleteGameServerCluster/main.go b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/DeleteGameServerCluster/main.go
index 4653e5787b8..ab005a3625c 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/DeleteGameServerCluster/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/DeleteGameServerCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.DeleteGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#DeleteGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#DeleteGameServerClusterRequest.
 	}
 	op, err := c.DeleteGameServerCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/GetGameServerCluster/main.go b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/GetGameServerCluster/main.go
index 0cff3ff1702..674d3f3dab1 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/GetGameServerCluster/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/GetGameServerCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.GetGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetGameServerClusterRequest.
 	}
 	resp, err := c.GetGameServerCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/ListGameServerClusters/main.go b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/ListGameServerClusters/main.go
index bafb8fca62a..307dd0b0ea4 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/ListGameServerClusters/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/ListGameServerClusters/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"google.golang.org/api/iterator"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gamingpb.ListGameServerClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListGameServerClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListGameServerClustersRequest.
 	}
 	it := c.ListGameServerClusters(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewCreateGameServerCluster/main.go b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewCreateGameServerCluster/main.go
index 301aa253976..bbc49627725 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewCreateGameServerCluster/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewCreateGameServerCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.PreviewCreateGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewCreateGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewCreateGameServerClusterRequest.
 	}
 	resp, err := c.PreviewCreateGameServerCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewDeleteGameServerCluster/main.go b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewDeleteGameServerCluster/main.go
index 0435ff314d5..08d41f3f38f 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewDeleteGameServerCluster/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewDeleteGameServerCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.PreviewDeleteGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewDeleteGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewDeleteGameServerClusterRequest.
 	}
 	resp, err := c.PreviewDeleteGameServerCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewUpdateGameServerCluster/main.go b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewUpdateGameServerCluster/main.go
index 06a2779c805..690371b6719 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewUpdateGameServerCluster/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/PreviewUpdateGameServerCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.PreviewUpdateGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewUpdateGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewUpdateGameServerClusterRequest.
 	}
 	resp, err := c.PreviewUpdateGameServerCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/UpdateGameServerCluster/main.go b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/UpdateGameServerCluster/main.go
index 17959642435..a901178db3d 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/UpdateGameServerCluster/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerClustersClient/UpdateGameServerCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.UpdateGameServerClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#UpdateGameServerClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#UpdateGameServerClusterRequest.
 	}
 	op, err := c.UpdateGameServerCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/CreateGameServerConfig/main.go b/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/CreateGameServerConfig/main.go
index 32326bdd843..91916cf0cbc 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/CreateGameServerConfig/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/CreateGameServerConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.CreateGameServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#CreateGameServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#CreateGameServerConfigRequest.
 	}
 	op, err := c.CreateGameServerConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/DeleteGameServerConfig/main.go b/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/DeleteGameServerConfig/main.go
index ca13309a22d..e03a24dfe90 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/DeleteGameServerConfig/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/DeleteGameServerConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.DeleteGameServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#DeleteGameServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#DeleteGameServerConfigRequest.
 	}
 	op, err := c.DeleteGameServerConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/GetGameServerConfig/main.go b/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/GetGameServerConfig/main.go
index e71c1db37c6..c30ecdce8bb 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/GetGameServerConfig/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/GetGameServerConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.GetGameServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetGameServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetGameServerConfigRequest.
 	}
 	resp, err := c.GetGameServerConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/ListGameServerConfigs/main.go b/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/ListGameServerConfigs/main.go
index c30d51f118b..ae14f21c72c 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/ListGameServerConfigs/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerConfigsClient/ListGameServerConfigs/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"google.golang.org/api/iterator"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gamingpb.ListGameServerConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListGameServerConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListGameServerConfigsRequest.
 	}
 	it := c.ListGameServerConfigs(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/CreateGameServerDeployment/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/CreateGameServerDeployment/main.go
index 00cf2c46047..c45ae7074ab 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/CreateGameServerDeployment/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/CreateGameServerDeployment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.CreateGameServerDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#CreateGameServerDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#CreateGameServerDeploymentRequest.
 	}
 	op, err := c.CreateGameServerDeployment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/DeleteGameServerDeployment/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/DeleteGameServerDeployment/main.go
index d400ec7e7c2..e636b23e388 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/DeleteGameServerDeployment/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/DeleteGameServerDeployment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.DeleteGameServerDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#DeleteGameServerDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#DeleteGameServerDeploymentRequest.
 	}
 	op, err := c.DeleteGameServerDeployment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/FetchDeploymentState/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/FetchDeploymentState/main.go
index c0b7f5db55c..e2e0db5beb1 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/FetchDeploymentState/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/FetchDeploymentState/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.FetchDeploymentStateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#FetchDeploymentStateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#FetchDeploymentStateRequest.
 	}
 	resp, err := c.FetchDeploymentState(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/GetGameServerDeployment/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/GetGameServerDeployment/main.go
index 67fe2262dc2..af379346544 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/GetGameServerDeployment/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/GetGameServerDeployment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.GetGameServerDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetGameServerDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetGameServerDeploymentRequest.
 	}
 	resp, err := c.GetGameServerDeployment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/GetGameServerDeploymentRollout/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/GetGameServerDeploymentRollout/main.go
index 062fd5b7dc3..1bbc5c6a550 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/GetGameServerDeploymentRollout/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/GetGameServerDeploymentRollout/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.GetGameServerDeploymentRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetGameServerDeploymentRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetGameServerDeploymentRolloutRequest.
 	}
 	resp, err := c.GetGameServerDeploymentRollout(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/ListGameServerDeployments/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/ListGameServerDeployments/main.go
index 6c3f3dbbb49..4b366570278 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/ListGameServerDeployments/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/ListGameServerDeployments/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"google.golang.org/api/iterator"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gamingpb.ListGameServerDeploymentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListGameServerDeploymentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListGameServerDeploymentsRequest.
 	}
 	it := c.ListGameServerDeployments(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/PreviewGameServerDeploymentRollout/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/PreviewGameServerDeploymentRollout/main.go
index 82b77fe071a..588818858d2 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/PreviewGameServerDeploymentRollout/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/PreviewGameServerDeploymentRollout/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.PreviewGameServerDeploymentRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewGameServerDeploymentRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewGameServerDeploymentRolloutRequest.
 	}
 	resp, err := c.PreviewGameServerDeploymentRollout(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/UpdateGameServerDeployment/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/UpdateGameServerDeployment/main.go
index d0e7f042457..25c92f22e75 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/UpdateGameServerDeployment/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/UpdateGameServerDeployment/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.UpdateGameServerDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#UpdateGameServerDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#UpdateGameServerDeploymentRequest.
 	}
 	op, err := c.UpdateGameServerDeployment(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/UpdateGameServerDeploymentRollout/main.go b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/UpdateGameServerDeploymentRollout/main.go
index e469c31eb9f..e1db9247053 100644
--- a/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/UpdateGameServerDeploymentRollout/main.go
+++ b/internal/generated/snippets/gaming/apiv1/GameServerDeploymentsClient/UpdateGameServerDeploymentRollout/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.UpdateGameServerDeploymentRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#UpdateGameServerDeploymentRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#UpdateGameServerDeploymentRolloutRequest.
 	}
 	op, err := c.UpdateGameServerDeploymentRollout(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/RealmsClient/CreateRealm/main.go b/internal/generated/snippets/gaming/apiv1/RealmsClient/CreateRealm/main.go
index 46146e8edff..c122ac17dd1 100644
--- a/internal/generated/snippets/gaming/apiv1/RealmsClient/CreateRealm/main.go
+++ b/internal/generated/snippets/gaming/apiv1/RealmsClient/CreateRealm/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.CreateRealmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#CreateRealmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#CreateRealmRequest.
 	}
 	op, err := c.CreateRealm(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/RealmsClient/DeleteRealm/main.go b/internal/generated/snippets/gaming/apiv1/RealmsClient/DeleteRealm/main.go
index 1aeebef0e90..7dc3c80e49f 100644
--- a/internal/generated/snippets/gaming/apiv1/RealmsClient/DeleteRealm/main.go
+++ b/internal/generated/snippets/gaming/apiv1/RealmsClient/DeleteRealm/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.DeleteRealmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#DeleteRealmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#DeleteRealmRequest.
 	}
 	op, err := c.DeleteRealm(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/RealmsClient/GetRealm/main.go b/internal/generated/snippets/gaming/apiv1/RealmsClient/GetRealm/main.go
index 175feb07316..5480699d25d 100644
--- a/internal/generated/snippets/gaming/apiv1/RealmsClient/GetRealm/main.go
+++ b/internal/generated/snippets/gaming/apiv1/RealmsClient/GetRealm/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.GetRealmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#GetRealmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#GetRealmRequest.
 	}
 	resp, err := c.GetRealm(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/RealmsClient/ListRealms/main.go b/internal/generated/snippets/gaming/apiv1/RealmsClient/ListRealms/main.go
index 528331bd658..7a1148eac63 100644
--- a/internal/generated/snippets/gaming/apiv1/RealmsClient/ListRealms/main.go
+++ b/internal/generated/snippets/gaming/apiv1/RealmsClient/ListRealms/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 	"google.golang.org/api/iterator"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gamingpb.ListRealmsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#ListRealmsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#ListRealmsRequest.
 	}
 	it := c.ListRealms(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gaming/apiv1/RealmsClient/PreviewRealmUpdate/main.go b/internal/generated/snippets/gaming/apiv1/RealmsClient/PreviewRealmUpdate/main.go
index e6e4815353d..b25776adb46 100644
--- a/internal/generated/snippets/gaming/apiv1/RealmsClient/PreviewRealmUpdate/main.go
+++ b/internal/generated/snippets/gaming/apiv1/RealmsClient/PreviewRealmUpdate/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.PreviewRealmUpdateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#PreviewRealmUpdateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#PreviewRealmUpdateRequest.
 	}
 	resp, err := c.PreviewRealmUpdate(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/RealmsClient/UpdateRealm/main.go b/internal/generated/snippets/gaming/apiv1/RealmsClient/UpdateRealm/main.go
index d705cb7c2ee..d35044be767 100644
--- a/internal/generated/snippets/gaming/apiv1/RealmsClient/UpdateRealm/main.go
+++ b/internal/generated/snippets/gaming/apiv1/RealmsClient/UpdateRealm/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gaming "cloud.google.com/go/gaming/apiv1"
-
-	gamingpb "google.golang.org/genproto/googleapis/cloud/gaming/v1"
+	gamingpb "cloud.google.com/go/gaming/apiv1/gamingpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gamingpb.UpdateRealmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gaming/v1#UpdateRealmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gaming/apiv1/gamingpb#UpdateRealmRequest.
 	}
 	op, err := c.UpdateRealm(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gaming/apiv1/snippet_metadata.google.cloud.gaming.v1.json b/internal/generated/snippets/gaming/apiv1/snippet_metadata.google.cloud.gaming.v1.json
index 9e4a9c604a5..02810bb8fce 100644
--- a/internal/generated/snippets/gaming/apiv1/snippet_metadata.google.cloud.gaming.v1.json
+++ b/internal/generated/snippets/gaming/apiv1/snippet_metadata.google.cloud.gaming.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/gaming/apiv1",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -742,7 +742,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -788,7 +788,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -834,7 +834,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -880,7 +880,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -926,7 +926,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -972,7 +972,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1018,7 +1018,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1064,7 +1064,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -1110,7 +1110,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1156,7 +1156,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1202,7 +1202,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1248,7 +1248,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/gaming/apiv1beta/snippet_metadata.google.cloud.gaming.v1beta.json b/internal/generated/snippets/gaming/apiv1beta/snippet_metadata.google.cloud.gaming.v1beta.json
index 0e9add01a8e..c42c518d906 100644
--- a/internal/generated/snippets/gaming/apiv1beta/snippet_metadata.google.cloud.gaming.v1beta.json
+++ b/internal/generated/snippets/gaming/apiv1beta/snippet_metadata.google.cloud.gaming.v1beta.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/gaming/apiv1beta",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "language": "GO",
     "apis": [
       {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateBackup/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateBackup/main.go
index 9a4fa36065c..8a3d99318c2 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateBackup/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.CreateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateBackupRequest.
 	}
 	op, err := c.CreateBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateBackupPlan/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateBackupPlan/main.go
index b00cb3fce4f..c20179efc30 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateBackupPlan/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateBackupPlan/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.CreateBackupPlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateBackupPlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateBackupPlanRequest.
 	}
 	op, err := c.CreateBackupPlan(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateRestore/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateRestore/main.go
index d509aa25eb8..ad031a1ff79 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateRestore/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateRestore/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.CreateRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateRestoreRequest.
 	}
 	op, err := c.CreateRestore(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateRestorePlan/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateRestorePlan/main.go
index b785e02f40e..ad91c5bf010 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateRestorePlan/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/CreateRestorePlan/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.CreateRestorePlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#CreateRestorePlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#CreateRestorePlanRequest.
 	}
 	op, err := c.CreateRestorePlan(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteBackup/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteBackup/main.go
index ed7bbdba0c7..03d517f902e 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteBackup/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.DeleteBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#DeleteBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#DeleteBackupRequest.
 	}
 	op, err := c.DeleteBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteBackupPlan/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteBackupPlan/main.go
index be3dc21a015..bb9c88fadbb 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteBackupPlan/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteBackupPlan/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.DeleteBackupPlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#DeleteBackupPlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#DeleteBackupPlanRequest.
 	}
 	op, err := c.DeleteBackupPlan(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteRestore/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteRestore/main.go
index 6b5545c2290..ac4269e3349 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteRestore/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteRestore/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.DeleteRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#DeleteRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#DeleteRestoreRequest.
 	}
 	op, err := c.DeleteRestore(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteRestorePlan/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteRestorePlan/main.go
index d230fae2c8c..e6ed6b17438 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteRestorePlan/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/DeleteRestorePlan/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.DeleteRestorePlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#DeleteRestorePlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#DeleteRestorePlanRequest.
 	}
 	op, err := c.DeleteRestorePlan(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetBackup/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetBackup/main.go
index 4278b73d2b0..15de017203c 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetBackup/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.GetBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetBackupRequest.
 	}
 	resp, err := c.GetBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetBackupPlan/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetBackupPlan/main.go
index 22e5d71267c..c426e6e9222 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetBackupPlan/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetBackupPlan/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.GetBackupPlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetBackupPlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetBackupPlanRequest.
 	}
 	resp, err := c.GetBackupPlan(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetRestore/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetRestore/main.go
index f903febcf64..94a361c9260 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetRestore/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetRestore/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.GetRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetRestoreRequest.
 	}
 	resp, err := c.GetRestore(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetRestorePlan/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetRestorePlan/main.go
index 09aaf86b279..9a0dd2dd671 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetRestorePlan/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetRestorePlan/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.GetRestorePlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetRestorePlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetRestorePlanRequest.
 	}
 	resp, err := c.GetRestorePlan(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetVolumeBackup/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetVolumeBackup/main.go
index d03b7dea70b..73b64f5d7d7 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetVolumeBackup/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetVolumeBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.GetVolumeBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetVolumeBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetVolumeBackupRequest.
 	}
 	resp, err := c.GetVolumeBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetVolumeRestore/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetVolumeRestore/main.go
index f0370ee9858..08cc785d8ba 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetVolumeRestore/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/GetVolumeRestore/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.GetVolumeRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#GetVolumeRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#GetVolumeRestoreRequest.
 	}
 	resp, err := c.GetVolumeRestore(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListBackupPlans/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListBackupPlans/main.go
index f9b52299a08..4f5c8eaa824 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListBackupPlans/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListBackupPlans/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 	"google.golang.org/api/iterator"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkebackuppb.ListBackupPlansRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListBackupPlansRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListBackupPlansRequest.
 	}
 	it := c.ListBackupPlans(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListBackups/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListBackups/main.go
index 428bc068ef6..f7312ec54f1 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListBackups/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListBackups/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 	"google.golang.org/api/iterator"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkebackuppb.ListBackupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListBackupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListBackupsRequest.
 	}
 	it := c.ListBackups(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListRestorePlans/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListRestorePlans/main.go
index c30442b1190..df28727700c 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListRestorePlans/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListRestorePlans/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 	"google.golang.org/api/iterator"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkebackuppb.ListRestorePlansRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListRestorePlansRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListRestorePlansRequest.
 	}
 	it := c.ListRestorePlans(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListRestores/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListRestores/main.go
index 52be0c94092..b1c8cd0a40b 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListRestores/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListRestores/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 	"google.golang.org/api/iterator"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkebackuppb.ListRestoresRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListRestoresRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListRestoresRequest.
 	}
 	it := c.ListRestores(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListVolumeBackups/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListVolumeBackups/main.go
index 9ea647d2936..043a1fef172 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListVolumeBackups/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListVolumeBackups/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 	"google.golang.org/api/iterator"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkebackuppb.ListVolumeBackupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListVolumeBackupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListVolumeBackupsRequest.
 	}
 	it := c.ListVolumeBackups(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListVolumeRestores/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListVolumeRestores/main.go
index 27213496059..32193bde343 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListVolumeRestores/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/ListVolumeRestores/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 	"google.golang.org/api/iterator"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkebackuppb.ListVolumeRestoresRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#ListVolumeRestoresRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#ListVolumeRestoresRequest.
 	}
 	it := c.ListVolumeRestores(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateBackup/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateBackup/main.go
index bab630e5bb8..94dbaf9d541 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateBackup/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateBackup/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.UpdateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#UpdateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#UpdateBackupRequest.
 	}
 	op, err := c.UpdateBackup(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateBackupPlan/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateBackupPlan/main.go
index 7ac0f31d56b..4df3ce1df3d 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateBackupPlan/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateBackupPlan/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.UpdateBackupPlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#UpdateBackupPlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#UpdateBackupPlanRequest.
 	}
 	op, err := c.UpdateBackupPlan(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateRestore/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateRestore/main.go
index 391e4435258..722b729efc3 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateRestore/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateRestore/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.UpdateRestoreRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#UpdateRestoreRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#UpdateRestoreRequest.
 	}
 	op, err := c.UpdateRestore(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateRestorePlan/main.go b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateRestorePlan/main.go
index 515b916dfb2..8beced568ff 100644
--- a/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateRestorePlan/main.go
+++ b/internal/generated/snippets/gkebackup/apiv1/BackupForGKEClient/UpdateRestorePlan/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkebackup "cloud.google.com/go/gkebackup/apiv1"
-
-	gkebackuppb "google.golang.org/genproto/googleapis/cloud/gkebackup/v1"
+	gkebackuppb "cloud.google.com/go/gkebackup/apiv1/gkebackuppb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkebackuppb.UpdateRestorePlanRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkebackup/v1#UpdateRestorePlanRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkebackup/apiv1/gkebackuppb#UpdateRestorePlanRequest.
 	}
 	op, err := c.UpdateRestorePlan(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkebackup/apiv1/snippet_metadata.google.cloud.gkebackup.v1.json b/internal/generated/snippets/gkebackup/apiv1/snippet_metadata.google.cloud.gkebackup.v1.json
index 72650d32ae5..5aedd026be5 100644
--- a/internal/generated/snippets/gkebackup/apiv1/snippet_metadata.google.cloud.gkebackup.v1.json
+++ b/internal/generated/snippets/gkebackup/apiv1/snippet_metadata.google.cloud.gkebackup.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/gkebackup/apiv1",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -742,7 +742,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -788,7 +788,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -834,7 +834,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -880,7 +880,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -926,7 +926,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -972,7 +972,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1018,7 +1018,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1064,7 +1064,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1110,7 +1110,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/CreateAwsCluster/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/CreateAwsCluster/main.go
index 5ead62fca0a..2b2072cd363 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/CreateAwsCluster/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/CreateAwsCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.CreateAwsClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAwsClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAwsClusterRequest.
 	}
 	op, err := c.CreateAwsCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/CreateAwsNodePool/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/CreateAwsNodePool/main.go
index d12c87dfe90..cc9f51f7b90 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/CreateAwsNodePool/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/CreateAwsNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.CreateAwsNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAwsNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAwsNodePoolRequest.
 	}
 	op, err := c.CreateAwsNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/DeleteAwsCluster/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/DeleteAwsCluster/main.go
index c0e2c4b7875..ff157bbaf37 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/DeleteAwsCluster/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/DeleteAwsCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.DeleteAwsClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAwsClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAwsClusterRequest.
 	}
 	op, err := c.DeleteAwsCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/DeleteAwsNodePool/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/DeleteAwsNodePool/main.go
index c19d5a0ceab..e6d896c4dd0 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/DeleteAwsNodePool/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/DeleteAwsNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.DeleteAwsNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAwsNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAwsNodePoolRequest.
 	}
 	op, err := c.DeleteAwsNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GenerateAwsAccessToken/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GenerateAwsAccessToken/main.go
index b1244968d96..c731b600a74 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GenerateAwsAccessToken/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GenerateAwsAccessToken/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GenerateAwsAccessTokenRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GenerateAwsAccessTokenRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GenerateAwsAccessTokenRequest.
 	}
 	resp, err := c.GenerateAwsAccessToken(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsCluster/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsCluster/main.go
index a507078909b..2ae5f5b2dd2 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsCluster/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GetAwsClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAwsClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAwsClusterRequest.
 	}
 	resp, err := c.GetAwsCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsNodePool/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsNodePool/main.go
index 815afc5bcfb..813c36b958c 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsNodePool/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GetAwsNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAwsNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAwsNodePoolRequest.
 	}
 	resp, err := c.GetAwsNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsServerConfig/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsServerConfig/main.go
index 7cd797d6c9a..ad73bb37b3f 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsServerConfig/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/GetAwsServerConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GetAwsServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAwsServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAwsServerConfigRequest.
 	}
 	resp, err := c.GetAwsServerConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/ListAwsClusters/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/ListAwsClusters/main.go
index 308a8af8ed4..43a5cadae68 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/ListAwsClusters/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/ListAwsClusters/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"google.golang.org/api/iterator"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkemulticloudpb.ListAwsClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAwsClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAwsClustersRequest.
 	}
 	it := c.ListAwsClusters(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/ListAwsNodePools/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/ListAwsNodePools/main.go
index 363abc5590c..514969b9426 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/ListAwsNodePools/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/ListAwsNodePools/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"google.golang.org/api/iterator"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkemulticloudpb.ListAwsNodePoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAwsNodePoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAwsNodePoolsRequest.
 	}
 	it := c.ListAwsNodePools(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/UpdateAwsCluster/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/UpdateAwsCluster/main.go
index 27d43babab8..34f5f1b3915 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/UpdateAwsCluster/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/UpdateAwsCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.UpdateAwsClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#UpdateAwsClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#UpdateAwsClusterRequest.
 	}
 	op, err := c.UpdateAwsCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/UpdateAwsNodePool/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/UpdateAwsNodePool/main.go
index d64ac52cb81..2ea7ca5e51e 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/UpdateAwsNodePool/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AwsClustersClient/UpdateAwsNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.UpdateAwsNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#UpdateAwsNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#UpdateAwsNodePoolRequest.
 	}
 	op, err := c.UpdateAwsNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureClient/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureClient/main.go
index 9339b526265..3398bc154be 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureClient/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureClient/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.CreateAzureClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAzureClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAzureClientRequest.
 	}
 	op, err := c.CreateAzureClient(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureCluster/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureCluster/main.go
index 0b3b31f6934..e677843c551 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureCluster/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.CreateAzureClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAzureClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAzureClusterRequest.
 	}
 	op, err := c.CreateAzureCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureNodePool/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureNodePool/main.go
index e28b53028e1..1b803e20cee 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureNodePool/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/CreateAzureNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.CreateAzureNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#CreateAzureNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#CreateAzureNodePoolRequest.
 	}
 	op, err := c.CreateAzureNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureClient/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureClient/main.go
index fc7c9c8fef2..80516ac50ff 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureClient/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureClient/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.DeleteAzureClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAzureClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAzureClientRequest.
 	}
 	op, err := c.DeleteAzureClient(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureCluster/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureCluster/main.go
index 00adb92411e..282af8af701 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureCluster/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.DeleteAzureClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAzureClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAzureClusterRequest.
 	}
 	op, err := c.DeleteAzureCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureNodePool/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureNodePool/main.go
index d5ebcafeffe..207a33bb2d9 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureNodePool/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/DeleteAzureNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.DeleteAzureNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#DeleteAzureNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#DeleteAzureNodePoolRequest.
 	}
 	op, err := c.DeleteAzureNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GenerateAzureAccessToken/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GenerateAzureAccessToken/main.go
index abdd4e1c601..efc1f3367ee 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GenerateAzureAccessToken/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GenerateAzureAccessToken/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GenerateAzureAccessTokenRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GenerateAzureAccessTokenRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GenerateAzureAccessTokenRequest.
 	}
 	resp, err := c.GenerateAzureAccessToken(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureClient/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureClient/main.go
index 2674462781f..fed2fb68545 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureClient/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureClient/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GetAzureClientRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAzureClientRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAzureClientRequest.
 	}
 	resp, err := c.GetAzureClient(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureCluster/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureCluster/main.go
index 95d54456559..3957d6952d6 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureCluster/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GetAzureClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAzureClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAzureClusterRequest.
 	}
 	resp, err := c.GetAzureCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureNodePool/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureNodePool/main.go
index ecceb8ddc14..8445de2a604 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureNodePool/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GetAzureNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAzureNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAzureNodePoolRequest.
 	}
 	resp, err := c.GetAzureNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureServerConfig/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureServerConfig/main.go
index 7f27ad64891..d84fd635139 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureServerConfig/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/GetAzureServerConfig/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.GetAzureServerConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#GetAzureServerConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#GetAzureServerConfigRequest.
 	}
 	resp, err := c.GetAzureServerConfig(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureClients/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureClients/main.go
index 27f60a8624c..cc736177ffb 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureClients/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureClients/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"google.golang.org/api/iterator"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkemulticloudpb.ListAzureClientsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAzureClientsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAzureClientsRequest.
 	}
 	it := c.ListAzureClients(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureClusters/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureClusters/main.go
index e9f06024d13..0408881a415 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureClusters/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureClusters/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"google.golang.org/api/iterator"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkemulticloudpb.ListAzureClustersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAzureClustersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAzureClustersRequest.
 	}
 	it := c.ListAzureClusters(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureNodePools/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureNodePools/main.go
index e393ffe86ec..e525af498db 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureNodePools/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/ListAzureNodePools/main.go
@@ -22,9 +22,8 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 	"google.golang.org/api/iterator"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
 )
 
 func main() {
@@ -42,7 +41,7 @@ func main() {
 
 	req := &gkemulticloudpb.ListAzureNodePoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#ListAzureNodePoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#ListAzureNodePoolsRequest.
 	}
 	it := c.ListAzureNodePools(ctx, req)
 	for {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/UpdateAzureCluster/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/UpdateAzureCluster/main.go
index a00abc10fca..d4fb0e19d93 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/UpdateAzureCluster/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/UpdateAzureCluster/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.UpdateAzureClusterRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#UpdateAzureClusterRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#UpdateAzureClusterRequest.
 	}
 	op, err := c.UpdateAzureCluster(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/UpdateAzureNodePool/main.go b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/UpdateAzureNodePool/main.go
index 4f63d63ad8e..f146238fc5a 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/UpdateAzureNodePool/main.go
+++ b/internal/generated/snippets/gkemulticloud/apiv1/AzureClustersClient/UpdateAzureNodePool/main.go
@@ -22,8 +22,7 @@ import (
 	"context"
 
 	gkemulticloud "cloud.google.com/go/gkemulticloud/apiv1"
-
-	gkemulticloudpb "google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1"
+	gkemulticloudpb "cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb"
 )
 
 func main() {
@@ -41,7 +40,7 @@ func main() {
 
 	req := &gkemulticloudpb.UpdateAzureNodePoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/gkemulticloud/v1#UpdateAzureNodePoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/gkemulticloud/apiv1/gkemulticloudpb#UpdateAzureNodePoolRequest.
 	}
 	op, err := c.UpdateAzureNodePool(ctx, req)
 	if err != nil {
diff --git a/internal/generated/snippets/gkemulticloud/apiv1/snippet_metadata.google.cloud.gkemulticloud.v1.json b/internal/generated/snippets/gkemulticloud/apiv1/snippet_metadata.google.cloud.gkemulticloud.v1.json
index d6dc17031f2..db4817f487f 100644
--- a/internal/generated/snippets/gkemulticloud/apiv1/snippet_metadata.google.cloud.gkemulticloud.v1.json
+++ b/internal/generated/snippets/gkemulticloud/apiv1/snippet_metadata.google.cloud.gkemulticloud.v1.json
@@ -1,7 +1,7 @@
 {
   "clientLibrary": {
     "name": "cloud.google.com/go/gkemulticloud/apiv1",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "language": "GO",
     "apis": [
       {
@@ -52,7 +52,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -98,7 +98,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -144,7 +144,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -190,7 +190,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -236,7 +236,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -282,7 +282,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -328,7 +328,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -374,7 +374,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -420,7 +420,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -466,7 +466,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -512,7 +512,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -558,7 +558,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -604,7 +604,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -650,7 +650,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -696,7 +696,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -742,7 +742,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -788,7 +788,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -834,7 +834,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 57,
+          "end": 56,
           "type": "FULL"
         }
       ]
@@ -880,7 +880,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -926,7 +926,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -972,7 +972,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1018,7 +1018,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1064,7 +1064,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 54,
+          "end": 53,
           "type": "FULL"
         }
       ]
@@ -1110,7 +1110,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1156,7 +1156,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1202,7 +1202,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 61,
+          "end": 60,
           "type": "FULL"
         }
       ]
@@ -1248,7 +1248,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
@@ -1294,7 +1294,7 @@
       "segments": [
         {
           "start": 18,
-          "end": 59,
+          "end": 58,
           "type": "FULL"
         }
       ]
diff --git a/internal/generated/snippets/go.mod b/internal/generated/snippets/go.mod
index 77147047f53..92841c7d5ed 100644
--- a/internal/generated/snippets/go.mod
+++ b/internal/generated/snippets/go.mod
@@ -395,3 +395,7 @@ replace cloud.google.com/go/apigeeregistry => ../../../apigeeregistry
 replace cloud.google.com/go/apikeys => ../../../apikeys
 
 replace cloud.google.com/go/edgecontainer => ../../../edgecontainer
+
+replace cloud.google.com/go/compute/metadata => ../../../compute/metadata
+
+replace cloud.google.com/go/longrunning => ../../../longrunning
diff --git a/internal/generated/snippets/go.sum b/internal/generated/snippets/go.sum
index 910003c7204..a91759d05bf 100644
--- a/internal/generated/snippets/go.sum
+++ b/internal/generated/snippets/go.sum
@@ -1,7 +1,3 @@
-cloud.google.com/go/compute/metadata v0.1.0 h1:FTMMKATTtJnkrhXtblW2AMKVuSruLo30Th6Ml8DO0lc=
-cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU=
-cloud.google.com/go/longrunning v0.1.0 h1:CgjqG6G2OP6Ryu90GNpyjbWJrHnq581MWjtF4T1R94Q=
-cloud.google.com/go/longrunning v0.1.0/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
diff --git a/iot/aliasshim/aliasshim.go b/iot/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/iot/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/iot/apiv1/device_manager_client.go b/iot/apiv1/device_manager_client.go
index 44f313a3eae..f760c7672b0 100644
--- a/iot/apiv1/device_manager_client.go
+++ b/iot/apiv1/device_manager_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	iotpb "cloud.google.com/go/iot/apiv1/iotpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	iotpb "google.golang.org/genproto/googleapis/cloud/iot/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/iot/apiv1/device_manager_client_example_test.go b/iot/apiv1/device_manager_client_example_test.go
index 97b19592b75..690e02aa24f 100644
--- a/iot/apiv1/device_manager_client_example_test.go
+++ b/iot/apiv1/device_manager_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	iot "cloud.google.com/go/iot/apiv1"
+	iotpb "cloud.google.com/go/iot/apiv1/iotpb"
 	"google.golang.org/api/iterator"
-	iotpb "google.golang.org/genproto/googleapis/cloud/iot/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleDeviceManagerClient_CreateDeviceRegistry() {
 
 	req := &iotpb.CreateDeviceRegistryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#CreateDeviceRegistryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#CreateDeviceRegistryRequest.
 	}
 	resp, err := c.CreateDeviceRegistry(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleDeviceManagerClient_GetDeviceRegistry() {
 
 	req := &iotpb.GetDeviceRegistryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#GetDeviceRegistryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#GetDeviceRegistryRequest.
 	}
 	resp, err := c.GetDeviceRegistry(ctx, req)
 	if err != nil {
@@ -107,7 +107,7 @@ func ExampleDeviceManagerClient_UpdateDeviceRegistry() {
 
 	req := &iotpb.UpdateDeviceRegistryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#UpdateDeviceRegistryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#UpdateDeviceRegistryRequest.
 	}
 	resp, err := c.UpdateDeviceRegistry(ctx, req)
 	if err != nil {
@@ -132,7 +132,7 @@ func ExampleDeviceManagerClient_DeleteDeviceRegistry() {
 
 	req := &iotpb.DeleteDeviceRegistryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#DeleteDeviceRegistryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#DeleteDeviceRegistryRequest.
 	}
 	err = c.DeleteDeviceRegistry(ctx, req)
 	if err != nil {
@@ -155,7 +155,7 @@ func ExampleDeviceManagerClient_ListDeviceRegistries() {
 
 	req := &iotpb.ListDeviceRegistriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#ListDeviceRegistriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#ListDeviceRegistriesRequest.
 	}
 	it := c.ListDeviceRegistries(ctx, req)
 	for {
@@ -186,7 +186,7 @@ func ExampleDeviceManagerClient_CreateDevice() {
 
 	req := &iotpb.CreateDeviceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#CreateDeviceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#CreateDeviceRequest.
 	}
 	resp, err := c.CreateDevice(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExampleDeviceManagerClient_GetDevice() {
 
 	req := &iotpb.GetDeviceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#GetDeviceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#GetDeviceRequest.
 	}
 	resp, err := c.GetDevice(ctx, req)
 	if err != nil {
@@ -236,7 +236,7 @@ func ExampleDeviceManagerClient_UpdateDevice() {
 
 	req := &iotpb.UpdateDeviceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#UpdateDeviceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#UpdateDeviceRequest.
 	}
 	resp, err := c.UpdateDevice(ctx, req)
 	if err != nil {
@@ -261,7 +261,7 @@ func ExampleDeviceManagerClient_DeleteDevice() {
 
 	req := &iotpb.DeleteDeviceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#DeleteDeviceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#DeleteDeviceRequest.
 	}
 	err = c.DeleteDevice(ctx, req)
 	if err != nil {
@@ -284,7 +284,7 @@ func ExampleDeviceManagerClient_ListDevices() {
 
 	req := &iotpb.ListDevicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#ListDevicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#ListDevicesRequest.
 	}
 	it := c.ListDevices(ctx, req)
 	for {
@@ -315,7 +315,7 @@ func ExampleDeviceManagerClient_ModifyCloudToDeviceConfig() {
 
 	req := &iotpb.ModifyCloudToDeviceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#ModifyCloudToDeviceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#ModifyCloudToDeviceConfigRequest.
 	}
 	resp, err := c.ModifyCloudToDeviceConfig(ctx, req)
 	if err != nil {
@@ -340,7 +340,7 @@ func ExampleDeviceManagerClient_ListDeviceConfigVersions() {
 
 	req := &iotpb.ListDeviceConfigVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#ListDeviceConfigVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#ListDeviceConfigVersionsRequest.
 	}
 	resp, err := c.ListDeviceConfigVersions(ctx, req)
 	if err != nil {
@@ -365,7 +365,7 @@ func ExampleDeviceManagerClient_ListDeviceStates() {
 
 	req := &iotpb.ListDeviceStatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#ListDeviceStatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#ListDeviceStatesRequest.
 	}
 	resp, err := c.ListDeviceStates(ctx, req)
 	if err != nil {
@@ -465,7 +465,7 @@ func ExampleDeviceManagerClient_SendCommandToDevice() {
 
 	req := &iotpb.SendCommandToDeviceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#SendCommandToDeviceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#SendCommandToDeviceRequest.
 	}
 	resp, err := c.SendCommandToDevice(ctx, req)
 	if err != nil {
@@ -490,7 +490,7 @@ func ExampleDeviceManagerClient_BindDeviceToGateway() {
 
 	req := &iotpb.BindDeviceToGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#BindDeviceToGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#BindDeviceToGatewayRequest.
 	}
 	resp, err := c.BindDeviceToGateway(ctx, req)
 	if err != nil {
@@ -515,7 +515,7 @@ func ExampleDeviceManagerClient_UnbindDeviceFromGateway() {
 
 	req := &iotpb.UnbindDeviceFromGatewayRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#UnbindDeviceFromGatewayRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#UnbindDeviceFromGatewayRequest.
 	}
 	resp, err := c.UnbindDeviceFromGateway(ctx, req)
 	if err != nil {
diff --git a/iot/apiv1/doc.go b/iot/apiv1/doc.go
index b06e3d412e9..22b8bdfe16d 100644
--- a/iot/apiv1/doc.go
+++ b/iot/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &iotpb.CreateDeviceRegistryRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/iot/v1#CreateDeviceRegistryRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/iot/apiv1/iotpb#CreateDeviceRegistryRequest.
 //	}
 //	resp, err := c.CreateDeviceRegistry(ctx, req)
 //	if err != nil {
diff --git a/iot/apiv1/iotpb/device_manager.pb.go b/iot/apiv1/iotpb/device_manager.pb.go
index 08a1b4c20fd..625c3cb8fa7 100644
--- a/iot/apiv1/iotpb/device_manager.pb.go
+++ b/iot/apiv1/iotpb/device_manager.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/iot/v1/device_manager.proto
 
 package iotpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -219,7 +219,7 @@ type UpdateDeviceRegistryRequest struct {
 	// are immutable or only set by the server.
 	// Mutable top-level fields: `event_notification_config`, `http_config`,
 	// `mqtt_config`, and `state_notification_config`.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateDeviceRegistryRequest) Reset() {
@@ -261,7 +261,7 @@ func (x *UpdateDeviceRegistryRequest) GetDeviceRegistry() *DeviceRegistry {
 	return nil
 }
 
-func (x *UpdateDeviceRegistryRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDeviceRegistryRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -476,7 +476,7 @@ type GetDeviceRequest struct {
 	// The fields of the `Device` resource to be returned in the response. If the
 	// field mask is unset or empty, all fields are returned. Fields have to be
 	// provided in snake_case format, for example: `last_heartbeat_time`.
-	FieldMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
+	FieldMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
 }
 
 func (x *GetDeviceRequest) Reset() {
@@ -518,7 +518,7 @@ func (x *GetDeviceRequest) GetName() string {
 	return ""
 }
 
-func (x *GetDeviceRequest) GetFieldMask() *field_mask.FieldMask {
+func (x *GetDeviceRequest) GetFieldMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.FieldMask
 	}
@@ -540,7 +540,7 @@ type UpdateDeviceRequest struct {
 	// The field mask must not be empty, and it must not contain fields that
 	// are immutable or only set by the server.
 	// Mutable top-level fields: `credentials`, `blocked`, and `metadata`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateDeviceRequest) Reset() {
@@ -582,7 +582,7 @@ func (x *UpdateDeviceRequest) GetDevice() *Device {
 	return nil
 }
 
-func (x *UpdateDeviceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDeviceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -659,7 +659,7 @@ type ListDevicesRequest struct {
 	// fields `id` and `num_id` are always returned, along with any
 	// other fields specified in snake_case format, for example:
 	// `last_heartbeat_time`.
-	FieldMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
+	FieldMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
 	// Options related to gateways.
 	GatewayListOptions *GatewayListOptions `protobuf:"bytes,6,opt,name=gateway_list_options,json=gatewayListOptions,proto3" json:"gateway_list_options,omitempty"`
 	// The maximum number of devices to return in the response. If this value
@@ -726,7 +726,7 @@ func (x *ListDevicesRequest) GetDeviceIds() []string {
 	return nil
 }
 
-func (x *ListDevicesRequest) GetFieldMask() *field_mask.FieldMask {
+func (x *ListDevicesRequest) GetFieldMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.FieldMask
 	}
@@ -2139,7 +2139,7 @@ var file_google_cloud_iot_v1_device_manager_proto_goTypes = []interface{}{
 	(*UnbindDeviceFromGatewayRequest)(nil),   // 22: google.cloud.iot.v1.UnbindDeviceFromGatewayRequest
 	(*UnbindDeviceFromGatewayResponse)(nil),  // 23: google.cloud.iot.v1.UnbindDeviceFromGatewayResponse
 	(*DeviceRegistry)(nil),                   // 24: google.cloud.iot.v1.DeviceRegistry
-	(*field_mask.FieldMask)(nil),             // 25: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),            // 25: google.protobuf.FieldMask
 	(*Device)(nil),                           // 26: google.cloud.iot.v1.Device
 	(GatewayType)(0),                         // 27: google.cloud.iot.v1.GatewayType
 	(*DeviceConfig)(nil),                     // 28: google.cloud.iot.v1.DeviceConfig
@@ -2147,7 +2147,7 @@ var file_google_cloud_iot_v1_device_manager_proto_goTypes = []interface{}{
 	(*v1.SetIamPolicyRequest)(nil),           // 30: google.iam.v1.SetIamPolicyRequest
 	(*v1.GetIamPolicyRequest)(nil),           // 31: google.iam.v1.GetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),     // 32: google.iam.v1.TestIamPermissionsRequest
-	(*empty.Empty)(nil),                      // 33: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                    // 33: google.protobuf.Empty
 	(*v1.Policy)(nil),                        // 34: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil),    // 35: google.iam.v1.TestIamPermissionsResponse
 }
@@ -2551,7 +2551,7 @@ type DeviceManagerClient interface {
 	// Updates a device registry configuration.
 	UpdateDeviceRegistry(ctx context.Context, in *UpdateDeviceRegistryRequest, opts ...grpc.CallOption) (*DeviceRegistry, error)
 	// Deletes a device registry configuration.
-	DeleteDeviceRegistry(ctx context.Context, in *DeleteDeviceRegistryRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteDeviceRegistry(ctx context.Context, in *DeleteDeviceRegistryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists device registries.
 	ListDeviceRegistries(ctx context.Context, in *ListDeviceRegistriesRequest, opts ...grpc.CallOption) (*ListDeviceRegistriesResponse, error)
 	// Creates a device in a device registry.
@@ -2561,7 +2561,7 @@ type DeviceManagerClient interface {
 	// Updates a device.
 	UpdateDevice(ctx context.Context, in *UpdateDeviceRequest, opts ...grpc.CallOption) (*Device, error)
 	// Deletes a device.
-	DeleteDevice(ctx context.Context, in *DeleteDeviceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteDevice(ctx context.Context, in *DeleteDeviceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// List devices in a device registry.
 	ListDevices(ctx context.Context, in *ListDevicesRequest, opts ...grpc.CallOption) (*ListDevicesResponse, error)
 	// Modifies the configuration for the device, which is eventually sent from
@@ -2641,8 +2641,8 @@ func (c *deviceManagerClient) UpdateDeviceRegistry(ctx context.Context, in *Upda
 	return out, nil
 }
 
-func (c *deviceManagerClient) DeleteDeviceRegistry(ctx context.Context, in *DeleteDeviceRegistryRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *deviceManagerClient) DeleteDeviceRegistry(ctx context.Context, in *DeleteDeviceRegistryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/DeleteDeviceRegistry", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2686,8 +2686,8 @@ func (c *deviceManagerClient) UpdateDevice(ctx context.Context, in *UpdateDevice
 	return out, nil
 }
 
-func (c *deviceManagerClient) DeleteDevice(ctx context.Context, in *DeleteDeviceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *deviceManagerClient) DeleteDevice(ctx context.Context, in *DeleteDeviceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.iot.v1.DeviceManager/DeleteDevice", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2794,7 +2794,7 @@ type DeviceManagerServer interface {
 	// Updates a device registry configuration.
 	UpdateDeviceRegistry(context.Context, *UpdateDeviceRegistryRequest) (*DeviceRegistry, error)
 	// Deletes a device registry configuration.
-	DeleteDeviceRegistry(context.Context, *DeleteDeviceRegistryRequest) (*empty.Empty, error)
+	DeleteDeviceRegistry(context.Context, *DeleteDeviceRegistryRequest) (*emptypb.Empty, error)
 	// Lists device registries.
 	ListDeviceRegistries(context.Context, *ListDeviceRegistriesRequest) (*ListDeviceRegistriesResponse, error)
 	// Creates a device in a device registry.
@@ -2804,7 +2804,7 @@ type DeviceManagerServer interface {
 	// Updates a device.
 	UpdateDevice(context.Context, *UpdateDeviceRequest) (*Device, error)
 	// Deletes a device.
-	DeleteDevice(context.Context, *DeleteDeviceRequest) (*empty.Empty, error)
+	DeleteDevice(context.Context, *DeleteDeviceRequest) (*emptypb.Empty, error)
 	// List devices in a device registry.
 	ListDevices(context.Context, *ListDevicesRequest) (*ListDevicesResponse, error)
 	// Modifies the configuration for the device, which is eventually sent from
@@ -2862,7 +2862,7 @@ func (*UnimplementedDeviceManagerServer) GetDeviceRegistry(context.Context, *Get
 func (*UnimplementedDeviceManagerServer) UpdateDeviceRegistry(context.Context, *UpdateDeviceRegistryRequest) (*DeviceRegistry, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateDeviceRegistry not implemented")
 }
-func (*UnimplementedDeviceManagerServer) DeleteDeviceRegistry(context.Context, *DeleteDeviceRegistryRequest) (*empty.Empty, error) {
+func (*UnimplementedDeviceManagerServer) DeleteDeviceRegistry(context.Context, *DeleteDeviceRegistryRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteDeviceRegistry not implemented")
 }
 func (*UnimplementedDeviceManagerServer) ListDeviceRegistries(context.Context, *ListDeviceRegistriesRequest) (*ListDeviceRegistriesResponse, error) {
@@ -2877,7 +2877,7 @@ func (*UnimplementedDeviceManagerServer) GetDevice(context.Context, *GetDeviceRe
 func (*UnimplementedDeviceManagerServer) UpdateDevice(context.Context, *UpdateDeviceRequest) (*Device, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateDevice not implemented")
 }
-func (*UnimplementedDeviceManagerServer) DeleteDevice(context.Context, *DeleteDeviceRequest) (*empty.Empty, error) {
+func (*UnimplementedDeviceManagerServer) DeleteDevice(context.Context, *DeleteDeviceRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteDevice not implemented")
 }
 func (*UnimplementedDeviceManagerServer) ListDevices(context.Context, *ListDevicesRequest) (*ListDevicesResponse, error) {
diff --git a/iot/apiv1/iotpb/resources.pb.go b/iot/apiv1/iotpb/resources.pb.go
index e51477a7537..16a0a423d7c 100644
--- a/iot/apiv1/iotpb/resources.pb.go
+++ b/iot/apiv1/iotpb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/iot/v1/resources.proto
 
 package iotpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -485,22 +485,22 @@ type Device struct {
 	// send `PINGREQ` messages if the connection is idle, and no other messages
 	// have been sent. Timestamps are periodically collected and written to
 	// storage; they may be stale by a few minutes.
-	LastHeartbeatTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=last_heartbeat_time,json=lastHeartbeatTime,proto3" json:"last_heartbeat_time,omitempty"`
+	LastHeartbeatTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=last_heartbeat_time,json=lastHeartbeatTime,proto3" json:"last_heartbeat_time,omitempty"`
 	// [Output only] The last time a telemetry event was received. Timestamps are
 	// periodically collected and written to storage; they may be stale by a few
 	// minutes.
-	LastEventTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=last_event_time,json=lastEventTime,proto3" json:"last_event_time,omitempty"`
+	LastEventTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=last_event_time,json=lastEventTime,proto3" json:"last_event_time,omitempty"`
 	// [Output only] The last time a state event was received. Timestamps are
 	// periodically collected and written to storage; they may be stale by a few
 	// minutes.
-	LastStateTime *timestamp.Timestamp `protobuf:"bytes,20,opt,name=last_state_time,json=lastStateTime,proto3" json:"last_state_time,omitempty"`
+	LastStateTime *timestamppb.Timestamp `protobuf:"bytes,20,opt,name=last_state_time,json=lastStateTime,proto3" json:"last_state_time,omitempty"`
 	// [Output only] The last time a cloud-to-device config version acknowledgment
 	// was received from the device. This field is only for configurations
 	// sent through MQTT.
-	LastConfigAckTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=last_config_ack_time,json=lastConfigAckTime,proto3" json:"last_config_ack_time,omitempty"`
+	LastConfigAckTime *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=last_config_ack_time,json=lastConfigAckTime,proto3" json:"last_config_ack_time,omitempty"`
 	// [Output only] The last time a cloud-to-device config version was sent to
 	// the device.
-	LastConfigSendTime *timestamp.Timestamp `protobuf:"bytes,18,opt,name=last_config_send_time,json=lastConfigSendTime,proto3" json:"last_config_send_time,omitempty"`
+	LastConfigSendTime *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=last_config_send_time,json=lastConfigSendTime,proto3" json:"last_config_send_time,omitempty"`
 	// If a device is blocked, connections or requests from this device will fail.
 	// Can be used to temporarily prevent the device from connecting if, for
 	// example, the sensor is generating bad data and needs maintenance.
@@ -508,7 +508,7 @@ type Device struct {
 	// [Output only] The time the most recent error occurred, such as a failure to
 	// publish to Cloud Pub/Sub. This field is the timestamp of
 	// 'last_error_status'.
-	LastErrorTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=last_error_time,json=lastErrorTime,proto3" json:"last_error_time,omitempty"`
+	LastErrorTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=last_error_time,json=lastErrorTime,proto3" json:"last_error_time,omitempty"`
 	// [Output only] The error message of the most recent error, such as a failure
 	// to publish to Cloud Pub/Sub. 'last_error_time' is the timestamp of this
 	// field. If no errors have occurred, this field has an empty message
@@ -606,35 +606,35 @@ func (x *Device) GetCredentials() []*DeviceCredential {
 	return nil
 }
 
-func (x *Device) GetLastHeartbeatTime() *timestamp.Timestamp {
+func (x *Device) GetLastHeartbeatTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastHeartbeatTime
 	}
 	return nil
 }
 
-func (x *Device) GetLastEventTime() *timestamp.Timestamp {
+func (x *Device) GetLastEventTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastEventTime
 	}
 	return nil
 }
 
-func (x *Device) GetLastStateTime() *timestamp.Timestamp {
+func (x *Device) GetLastStateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastStateTime
 	}
 	return nil
 }
 
-func (x *Device) GetLastConfigAckTime() *timestamp.Timestamp {
+func (x *Device) GetLastConfigAckTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastConfigAckTime
 	}
 	return nil
 }
 
-func (x *Device) GetLastConfigSendTime() *timestamp.Timestamp {
+func (x *Device) GetLastConfigSendTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastConfigSendTime
 	}
@@ -648,7 +648,7 @@ func (x *Device) GetBlocked() bool {
 	return false
 }
 
-func (x *Device) GetLastErrorTime() *timestamp.Timestamp {
+func (x *Device) GetLastErrorTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastErrorTime
 	}
@@ -712,7 +712,7 @@ type GatewayConfig struct {
 	LastAccessedGatewayId string `protobuf:"bytes,3,opt,name=last_accessed_gateway_id,json=lastAccessedGatewayId,proto3" json:"last_accessed_gateway_id,omitempty"`
 	// [Output only] The most recent time at which the device accessed the gateway
 	// specified in `last_accessed_gateway`.
-	LastAccessedGatewayTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_accessed_gateway_time,json=lastAccessedGatewayTime,proto3" json:"last_accessed_gateway_time,omitempty"`
+	LastAccessedGatewayTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_accessed_gateway_time,json=lastAccessedGatewayTime,proto3" json:"last_accessed_gateway_time,omitempty"`
 }
 
 func (x *GatewayConfig) Reset() {
@@ -768,7 +768,7 @@ func (x *GatewayConfig) GetLastAccessedGatewayId() string {
 	return ""
 }
 
-func (x *GatewayConfig) GetLastAccessedGatewayTime() *timestamp.Timestamp {
+func (x *GatewayConfig) GetLastAccessedGatewayTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastAccessedGatewayTime
 	}
@@ -1208,9 +1208,9 @@ type X509CertificateDetails struct {
 	// The entity the certificate and public key belong to.
 	Subject string `protobuf:"bytes,2,opt,name=subject,proto3" json:"subject,omitempty"`
 	// The time the certificate becomes valid.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The time the certificate becomes invalid.
-	ExpiryTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=expiry_time,json=expiryTime,proto3" json:"expiry_time,omitempty"`
+	ExpiryTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=expiry_time,json=expiryTime,proto3" json:"expiry_time,omitempty"`
 	// The algorithm used to sign the certificate.
 	SignatureAlgorithm string `protobuf:"bytes,5,opt,name=signature_algorithm,json=signatureAlgorithm,proto3" json:"signature_algorithm,omitempty"`
 	// The type of public key in the certificate.
@@ -1263,14 +1263,14 @@ func (x *X509CertificateDetails) GetSubject() string {
 	return ""
 }
 
-func (x *X509CertificateDetails) GetStartTime() *timestamp.Timestamp {
+func (x *X509CertificateDetails) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *X509CertificateDetails) GetExpiryTime() *timestamp.Timestamp {
+func (x *X509CertificateDetails) GetExpiryTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpiryTime
 	}
@@ -1373,7 +1373,7 @@ type DeviceCredential struct {
 	// [Optional] The time at which this credential becomes invalid. This
 	// credential will be ignored for new client authentication requests after
 	// this timestamp; however, it will not be automatically deleted.
-	ExpirationTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
+	ExpirationTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=expiration_time,json=expirationTime,proto3" json:"expiration_time,omitempty"`
 }
 
 func (x *DeviceCredential) Reset() {
@@ -1422,7 +1422,7 @@ func (x *DeviceCredential) GetPublicKey() *PublicKeyCredential {
 	return nil
 }
 
-func (x *DeviceCredential) GetExpirationTime() *timestamp.Timestamp {
+func (x *DeviceCredential) GetExpirationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpirationTime
 	}
@@ -1521,7 +1521,7 @@ type DeviceConfig struct {
 	Version int64 `protobuf:"varint,1,opt,name=version,proto3" json:"version,omitempty"`
 	// [Output only] The time at which this configuration version was updated in
 	// Cloud IoT Core. This timestamp is set by the server.
-	CloudUpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=cloud_update_time,json=cloudUpdateTime,proto3" json:"cloud_update_time,omitempty"`
+	CloudUpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=cloud_update_time,json=cloudUpdateTime,proto3" json:"cloud_update_time,omitempty"`
 	// [Output only] The time at which Cloud IoT Core received the
 	// acknowledgment from the device, indicating that the device has received
 	// this configuration version. If this field is not present, the device has
@@ -1531,7 +1531,7 @@ type DeviceConfig struct {
 	// connection, only the latest version is sent to the device. Some
 	// versions may never be sent to the device, and therefore are never
 	// acknowledged. This timestamp is set by Cloud IoT Core.
-	DeviceAckTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=device_ack_time,json=deviceAckTime,proto3" json:"device_ack_time,omitempty"`
+	DeviceAckTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=device_ack_time,json=deviceAckTime,proto3" json:"device_ack_time,omitempty"`
 	// The device configuration data.
 	BinaryData []byte `protobuf:"bytes,4,opt,name=binary_data,json=binaryData,proto3" json:"binary_data,omitempty"`
 }
@@ -1575,14 +1575,14 @@ func (x *DeviceConfig) GetVersion() int64 {
 	return 0
 }
 
-func (x *DeviceConfig) GetCloudUpdateTime() *timestamp.Timestamp {
+func (x *DeviceConfig) GetCloudUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CloudUpdateTime
 	}
 	return nil
 }
 
-func (x *DeviceConfig) GetDeviceAckTime() *timestamp.Timestamp {
+func (x *DeviceConfig) GetDeviceAckTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeviceAckTime
 	}
@@ -1604,7 +1604,7 @@ type DeviceState struct {
 
 	// [Output only] The time at which this state version was updated in Cloud
 	// IoT Core.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The device state data.
 	BinaryData []byte `protobuf:"bytes,2,opt,name=binary_data,json=binaryData,proto3" json:"binary_data,omitempty"`
 }
@@ -1641,7 +1641,7 @@ func (*DeviceState) Descriptor() ([]byte, []int) {
 	return file_google_cloud_iot_v1_resources_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *DeviceState) GetUpdateTime() *timestamp.Timestamp {
+func (x *DeviceState) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1990,7 +1990,7 @@ var file_google_cloud_iot_v1_resources_proto_goTypes = []interface{}{
 	(*DeviceConfig)(nil),            // 19: google.cloud.iot.v1.DeviceConfig
 	(*DeviceState)(nil),             // 20: google.cloud.iot.v1.DeviceState
 	nil,                             // 21: google.cloud.iot.v1.Device.MetadataEntry
-	(*timestamp.Timestamp)(nil),     // 22: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),   // 22: google.protobuf.Timestamp
 	(*status.Status)(nil),           // 23: google.rpc.Status
 }
 var file_google_cloud_iot_v1_resources_proto_depIdxs = []int32{
diff --git a/iot/go.mod b/iot/go.mod
index 7483e10b700..ff4adfce764 100644
--- a/iot/go.mod
+++ b/iot/go.mod
@@ -3,11 +3,10 @@ module cloud.google.com/go/iot
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go v0.105.0
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -15,12 +14,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/iot/go.sum b/iot/go.sum
index 8784b2a0c77..9ebb2713a7a 100644
--- a/iot/go.sum
+++ b/iot/go.sum
@@ -1,8 +1,9 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -39,6 +40,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/kms/aliasshim/aliasshim.go b/kms/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/kms/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/kms/apiv1/doc.go b/kms/apiv1/doc.go
index b3ef86cadb7..53d50e6a50b 100644
--- a/kms/apiv1/doc.go
+++ b/kms/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &kmspb.ListEkmConnectionsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#ListEkmConnectionsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#ListEkmConnectionsRequest.
 //	}
 //	it := c.ListEkmConnections(ctx, req)
 //	for {
diff --git a/kms/apiv1/ekm_client.go b/kms/apiv1/ekm_client.go
index 70acd427ae7..e4f37f767fb 100644
--- a/kms/apiv1/ekm_client.go
+++ b/kms/apiv1/ekm_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	kmspb "cloud.google.com/go/kms/apiv1/kmspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
diff --git a/kms/apiv1/ekm_client_example_test.go b/kms/apiv1/ekm_client_example_test.go
index f9cf71fad3b..c5a011d2625 100644
--- a/kms/apiv1/ekm_client_example_test.go
+++ b/kms/apiv1/ekm_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	kms "cloud.google.com/go/kms/apiv1"
+	kmspb "cloud.google.com/go/kms/apiv1/kmspb"
 	"google.golang.org/api/iterator"
-	kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
@@ -58,7 +58,7 @@ func ExampleEkmClient_ListEkmConnections() {
 
 	req := &kmspb.ListEkmConnectionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#ListEkmConnectionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#ListEkmConnectionsRequest.
 	}
 	it := c.ListEkmConnections(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleEkmClient_GetEkmConnection() {
 
 	req := &kmspb.GetEkmConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#GetEkmConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#GetEkmConnectionRequest.
 	}
 	resp, err := c.GetEkmConnection(ctx, req)
 	if err != nil {
@@ -114,7 +114,7 @@ func ExampleEkmClient_CreateEkmConnection() {
 
 	req := &kmspb.CreateEkmConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#CreateEkmConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#CreateEkmConnectionRequest.
 	}
 	resp, err := c.CreateEkmConnection(ctx, req)
 	if err != nil {
@@ -139,7 +139,7 @@ func ExampleEkmClient_UpdateEkmConnection() {
 
 	req := &kmspb.UpdateEkmConnectionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#UpdateEkmConnectionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#UpdateEkmConnectionRequest.
 	}
 	resp, err := c.UpdateEkmConnection(ctx, req)
 	if err != nil {
diff --git a/kms/apiv1/key_management_client.go b/kms/apiv1/key_management_client.go
index 9d41fba3111..3581887971a 100644
--- a/kms/apiv1/key_management_client.go
+++ b/kms/apiv1/key_management_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	kmspb "cloud.google.com/go/kms/apiv1/kmspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
diff --git a/kms/apiv1/key_management_client_example_test.go b/kms/apiv1/key_management_client_example_test.go
index 04ae22bc64f..ade51655f98 100644
--- a/kms/apiv1/key_management_client_example_test.go
+++ b/kms/apiv1/key_management_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	kms "cloud.google.com/go/kms/apiv1"
+	kmspb "cloud.google.com/go/kms/apiv1/kmspb"
 	"google.golang.org/api/iterator"
-	kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
@@ -58,7 +58,7 @@ func ExampleKeyManagementClient_ListKeyRings() {
 
 	req := &kmspb.ListKeyRingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#ListKeyRingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#ListKeyRingsRequest.
 	}
 	it := c.ListKeyRings(ctx, req)
 	for {
@@ -89,7 +89,7 @@ func ExampleKeyManagementClient_ListCryptoKeys() {
 
 	req := &kmspb.ListCryptoKeysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#ListCryptoKeysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#ListCryptoKeysRequest.
 	}
 	it := c.ListCryptoKeys(ctx, req)
 	for {
@@ -120,7 +120,7 @@ func ExampleKeyManagementClient_ListCryptoKeyVersions() {
 
 	req := &kmspb.ListCryptoKeyVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#ListCryptoKeyVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#ListCryptoKeyVersionsRequest.
 	}
 	it := c.ListCryptoKeyVersions(ctx, req)
 	for {
@@ -151,7 +151,7 @@ func ExampleKeyManagementClient_ListImportJobs() {
 
 	req := &kmspb.ListImportJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#ListImportJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#ListImportJobsRequest.
 	}
 	it := c.ListImportJobs(ctx, req)
 	for {
@@ -182,7 +182,7 @@ func ExampleKeyManagementClient_GetKeyRing() {
 
 	req := &kmspb.GetKeyRingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#GetKeyRingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#GetKeyRingRequest.
 	}
 	resp, err := c.GetKeyRing(ctx, req)
 	if err != nil {
@@ -207,7 +207,7 @@ func ExampleKeyManagementClient_GetCryptoKey() {
 
 	req := &kmspb.GetCryptoKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#GetCryptoKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#GetCryptoKeyRequest.
 	}
 	resp, err := c.GetCryptoKey(ctx, req)
 	if err != nil {
@@ -232,7 +232,7 @@ func ExampleKeyManagementClient_GetCryptoKeyVersion() {
 
 	req := &kmspb.GetCryptoKeyVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#GetCryptoKeyVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#GetCryptoKeyVersionRequest.
 	}
 	resp, err := c.GetCryptoKeyVersion(ctx, req)
 	if err != nil {
@@ -257,7 +257,7 @@ func ExampleKeyManagementClient_GetPublicKey() {
 
 	req := &kmspb.GetPublicKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#GetPublicKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#GetPublicKeyRequest.
 	}
 	resp, err := c.GetPublicKey(ctx, req)
 	if err != nil {
@@ -282,7 +282,7 @@ func ExampleKeyManagementClient_GetImportJob() {
 
 	req := &kmspb.GetImportJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#GetImportJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#GetImportJobRequest.
 	}
 	resp, err := c.GetImportJob(ctx, req)
 	if err != nil {
@@ -307,7 +307,7 @@ func ExampleKeyManagementClient_CreateKeyRing() {
 
 	req := &kmspb.CreateKeyRingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#CreateKeyRingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#CreateKeyRingRequest.
 	}
 	resp, err := c.CreateKeyRing(ctx, req)
 	if err != nil {
@@ -332,7 +332,7 @@ func ExampleKeyManagementClient_CreateCryptoKey() {
 
 	req := &kmspb.CreateCryptoKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#CreateCryptoKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#CreateCryptoKeyRequest.
 	}
 	resp, err := c.CreateCryptoKey(ctx, req)
 	if err != nil {
@@ -357,7 +357,7 @@ func ExampleKeyManagementClient_CreateCryptoKeyVersion() {
 
 	req := &kmspb.CreateCryptoKeyVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#CreateCryptoKeyVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#CreateCryptoKeyVersionRequest.
 	}
 	resp, err := c.CreateCryptoKeyVersion(ctx, req)
 	if err != nil {
@@ -382,7 +382,7 @@ func ExampleKeyManagementClient_ImportCryptoKeyVersion() {
 
 	req := &kmspb.ImportCryptoKeyVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#ImportCryptoKeyVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#ImportCryptoKeyVersionRequest.
 	}
 	resp, err := c.ImportCryptoKeyVersion(ctx, req)
 	if err != nil {
@@ -407,7 +407,7 @@ func ExampleKeyManagementClient_CreateImportJob() {
 
 	req := &kmspb.CreateImportJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#CreateImportJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#CreateImportJobRequest.
 	}
 	resp, err := c.CreateImportJob(ctx, req)
 	if err != nil {
@@ -432,7 +432,7 @@ func ExampleKeyManagementClient_UpdateCryptoKey() {
 
 	req := &kmspb.UpdateCryptoKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#UpdateCryptoKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#UpdateCryptoKeyRequest.
 	}
 	resp, err := c.UpdateCryptoKey(ctx, req)
 	if err != nil {
@@ -457,7 +457,7 @@ func ExampleKeyManagementClient_UpdateCryptoKeyVersion() {
 
 	req := &kmspb.UpdateCryptoKeyVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#UpdateCryptoKeyVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#UpdateCryptoKeyVersionRequest.
 	}
 	resp, err := c.UpdateCryptoKeyVersion(ctx, req)
 	if err != nil {
@@ -482,7 +482,7 @@ func ExampleKeyManagementClient_UpdateCryptoKeyPrimaryVersion() {
 
 	req := &kmspb.UpdateCryptoKeyPrimaryVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#UpdateCryptoKeyPrimaryVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#UpdateCryptoKeyPrimaryVersionRequest.
 	}
 	resp, err := c.UpdateCryptoKeyPrimaryVersion(ctx, req)
 	if err != nil {
@@ -507,7 +507,7 @@ func ExampleKeyManagementClient_DestroyCryptoKeyVersion() {
 
 	req := &kmspb.DestroyCryptoKeyVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#DestroyCryptoKeyVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#DestroyCryptoKeyVersionRequest.
 	}
 	resp, err := c.DestroyCryptoKeyVersion(ctx, req)
 	if err != nil {
@@ -532,7 +532,7 @@ func ExampleKeyManagementClient_RestoreCryptoKeyVersion() {
 
 	req := &kmspb.RestoreCryptoKeyVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#RestoreCryptoKeyVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#RestoreCryptoKeyVersionRequest.
 	}
 	resp, err := c.RestoreCryptoKeyVersion(ctx, req)
 	if err != nil {
@@ -557,7 +557,7 @@ func ExampleKeyManagementClient_Encrypt() {
 
 	req := &kmspb.EncryptRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#EncryptRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#EncryptRequest.
 	}
 	resp, err := c.Encrypt(ctx, req)
 	if err != nil {
@@ -582,7 +582,7 @@ func ExampleKeyManagementClient_Decrypt() {
 
 	req := &kmspb.DecryptRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#DecryptRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#DecryptRequest.
 	}
 	resp, err := c.Decrypt(ctx, req)
 	if err != nil {
@@ -607,7 +607,7 @@ func ExampleKeyManagementClient_AsymmetricSign() {
 
 	req := &kmspb.AsymmetricSignRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#AsymmetricSignRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#AsymmetricSignRequest.
 	}
 	resp, err := c.AsymmetricSign(ctx, req)
 	if err != nil {
@@ -632,7 +632,7 @@ func ExampleKeyManagementClient_AsymmetricDecrypt() {
 
 	req := &kmspb.AsymmetricDecryptRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#AsymmetricDecryptRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#AsymmetricDecryptRequest.
 	}
 	resp, err := c.AsymmetricDecrypt(ctx, req)
 	if err != nil {
@@ -657,7 +657,7 @@ func ExampleKeyManagementClient_MacSign() {
 
 	req := &kmspb.MacSignRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#MacSignRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#MacSignRequest.
 	}
 	resp, err := c.MacSign(ctx, req)
 	if err != nil {
@@ -682,7 +682,7 @@ func ExampleKeyManagementClient_MacVerify() {
 
 	req := &kmspb.MacVerifyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#MacVerifyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#MacVerifyRequest.
 	}
 	resp, err := c.MacVerify(ctx, req)
 	if err != nil {
@@ -707,7 +707,7 @@ func ExampleKeyManagementClient_GenerateRandomBytes() {
 
 	req := &kmspb.GenerateRandomBytesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/kms/v1#GenerateRandomBytesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/kms/apiv1/kmspb#GenerateRandomBytesRequest.
 	}
 	resp, err := c.GenerateRandomBytes(ctx, req)
 	if err != nil {
diff --git a/kms/apiv1/kmspb/ekm_service.pb.go b/kms/apiv1/kmspb/ekm_service.pb.go
index 66a6fcf210f..14b54a6e4da 100644
--- a/kms/apiv1/kmspb/ekm_service.pb.go
+++ b/kms/apiv1/kmspb/ekm_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/kms/v1/ekm_service.proto
 
 package kmspb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -343,7 +343,7 @@ type UpdateEkmConnectionRequest struct {
 	// values.
 	EkmConnection *EkmConnection `protobuf:"bytes,1,opt,name=ekm_connection,json=ekmConnection,proto3" json:"ekm_connection,omitempty"`
 	// Required. List of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateEkmConnectionRequest) Reset() {
@@ -385,7 +385,7 @@ func (x *UpdateEkmConnectionRequest) GetEkmConnection() *EkmConnection {
 	return nil
 }
 
-func (x *UpdateEkmConnectionRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEkmConnectionRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -414,10 +414,10 @@ type Certificate struct {
 	SubjectAlternativeDnsNames []string `protobuf:"bytes,5,rep,name=subject_alternative_dns_names,json=subjectAlternativeDnsNames,proto3" json:"subject_alternative_dns_names,omitempty"`
 	// Output only. The certificate is not valid before this time. Only present if
 	// [parsed][google.cloud.kms.v1.Certificate.parsed] is true.
-	NotBeforeTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=not_before_time,json=notBeforeTime,proto3" json:"not_before_time,omitempty"`
+	NotBeforeTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=not_before_time,json=notBeforeTime,proto3" json:"not_before_time,omitempty"`
 	// Output only. The certificate is not valid after this time. Only present if
 	// [parsed][google.cloud.kms.v1.Certificate.parsed] is true.
-	NotAfterTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=not_after_time,json=notAfterTime,proto3" json:"not_after_time,omitempty"`
+	NotAfterTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=not_after_time,json=notAfterTime,proto3" json:"not_after_time,omitempty"`
 	// Output only. The certificate serial number as a hex string. Only present if
 	// [parsed][google.cloud.kms.v1.Certificate.parsed] is true.
 	SerialNumber string `protobuf:"bytes,8,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"`
@@ -493,14 +493,14 @@ func (x *Certificate) GetSubjectAlternativeDnsNames() []string {
 	return nil
 }
 
-func (x *Certificate) GetNotBeforeTime() *timestamp.Timestamp {
+func (x *Certificate) GetNotBeforeTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NotBeforeTime
 	}
 	return nil
 }
 
-func (x *Certificate) GetNotAfterTime() *timestamp.Timestamp {
+func (x *Certificate) GetNotAfterTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NotAfterTime
 	}
@@ -540,7 +540,7 @@ type EkmConnection struct {
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time at which the
 	// [EkmConnection][google.cloud.kms.v1.EkmConnection] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// A list of
 	// [ServiceResolvers][google.cloud.kms.v1.EkmConnection.ServiceResolver] where
 	// the EKM can be reached. There should be one ServiceResolver per EKM
@@ -593,7 +593,7 @@ func (x *EkmConnection) GetName() string {
 	return ""
 }
 
-func (x *EkmConnection) GetCreateTime() *timestamp.Timestamp {
+func (x *EkmConnection) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -944,8 +944,8 @@ var file_google_cloud_kms_v1_ekm_service_proto_goTypes = []interface{}{
 	(*Certificate)(nil),                   // 5: google.cloud.kms.v1.Certificate
 	(*EkmConnection)(nil),                 // 6: google.cloud.kms.v1.EkmConnection
 	(*EkmConnection_ServiceResolver)(nil), // 7: google.cloud.kms.v1.EkmConnection.ServiceResolver
-	(*field_mask.FieldMask)(nil),          // 8: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),           // 9: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),         // 8: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),         // 9: google.protobuf.Timestamp
 }
 var file_google_cloud_kms_v1_ekm_service_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.kms.v1.ListEkmConnectionsResponse.ekm_connections:type_name -> google.cloud.kms.v1.EkmConnection
diff --git a/kms/apiv1/kmspb/resources.pb.go b/kms/apiv1/kmspb/resources.pb.go
index 49dbbe7520b..8f565f7a4d4 100644
--- a/kms/apiv1/kmspb/resources.pb.go
+++ b/kms/apiv1/kmspb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/kms/v1/resources.proto
 
 package kmspb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -720,7 +720,7 @@ type KeyRing struct {
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time at which this [KeyRing][google.cloud.kms.v1.KeyRing]
 	// was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *KeyRing) Reset() {
@@ -762,7 +762,7 @@ func (x *KeyRing) GetName() string {
 	return ""
 }
 
-func (x *KeyRing) GetCreateTime() *timestamp.Timestamp {
+func (x *KeyRing) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -803,7 +803,7 @@ type CryptoKey struct {
 	Purpose CryptoKey_CryptoKeyPurpose `protobuf:"varint,3,opt,name=purpose,proto3,enum=google.cloud.kms.v1.CryptoKey_CryptoKeyPurpose" json:"purpose,omitempty"`
 	// Output only. The time at which this
 	// [CryptoKey][google.cloud.kms.v1.CryptoKey] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// At [next_rotation_time][google.cloud.kms.v1.CryptoKey.next_rotation_time],
 	// the Key Management Service will automatically:
 	//
@@ -820,7 +820,7 @@ type CryptoKey struct {
 	// Keys with [purpose][google.cloud.kms.v1.CryptoKey.purpose]
 	// [ENCRYPT_DECRYPT][google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT]
 	// support automatic rotation. For other keys, this field must be omitted.
-	NextRotationTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=next_rotation_time,json=nextRotationTime,proto3" json:"next_rotation_time,omitempty"`
+	NextRotationTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=next_rotation_time,json=nextRotationTime,proto3" json:"next_rotation_time,omitempty"`
 	// Controls the rate of automatic rotation.
 	//
 	// Types that are assignable to RotationSchedule:
@@ -844,7 +844,7 @@ type CryptoKey struct {
 	// state before transitioning to
 	// [DESTROYED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROYED].
 	// If not specified at creation time, the default duration is 24 hours.
-	DestroyScheduledDuration *duration.Duration `protobuf:"bytes,14,opt,name=destroy_scheduled_duration,json=destroyScheduledDuration,proto3" json:"destroy_scheduled_duration,omitempty"`
+	DestroyScheduledDuration *durationpb.Duration `protobuf:"bytes,14,opt,name=destroy_scheduled_duration,json=destroyScheduledDuration,proto3" json:"destroy_scheduled_duration,omitempty"`
 	// Immutable. The resource name of the backend environment where the key
 	// material for all [CryptoKeyVersions][google.cloud.kms.v1.CryptoKeyVersion]
 	// associated with this [CryptoKey][google.cloud.kms.v1.CryptoKey] reside and
@@ -911,14 +911,14 @@ func (x *CryptoKey) GetPurpose() CryptoKey_CryptoKeyPurpose {
 	return CryptoKey_CRYPTO_KEY_PURPOSE_UNSPECIFIED
 }
 
-func (x *CryptoKey) GetCreateTime() *timestamp.Timestamp {
+func (x *CryptoKey) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CryptoKey) GetNextRotationTime() *timestamp.Timestamp {
+func (x *CryptoKey) GetNextRotationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NextRotationTime
 	}
@@ -932,7 +932,7 @@ func (m *CryptoKey) GetRotationSchedule() isCryptoKey_RotationSchedule {
 	return nil
 }
 
-func (x *CryptoKey) GetRotationPeriod() *duration.Duration {
+func (x *CryptoKey) GetRotationPeriod() *durationpb.Duration {
 	if x, ok := x.GetRotationSchedule().(*CryptoKey_RotationPeriod); ok {
 		return x.RotationPeriod
 	}
@@ -960,7 +960,7 @@ func (x *CryptoKey) GetImportOnly() bool {
 	return false
 }
 
-func (x *CryptoKey) GetDestroyScheduledDuration() *duration.Duration {
+func (x *CryptoKey) GetDestroyScheduledDuration() *durationpb.Duration {
 	if x != nil {
 		return x.DestroyScheduledDuration
 	}
@@ -991,7 +991,7 @@ type CryptoKey_RotationPeriod struct {
 	// Keys with [purpose][google.cloud.kms.v1.CryptoKey.purpose]
 	// [ENCRYPT_DECRYPT][google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.ENCRYPT_DECRYPT]
 	// support automatic rotation. For other keys, this field must be omitted.
-	RotationPeriod *duration.Duration `protobuf:"bytes,8,opt,name=rotation_period,json=rotationPeriod,proto3,oneof"`
+	RotationPeriod *durationpb.Duration `protobuf:"bytes,8,opt,name=rotation_period,json=rotationPeriod,proto3,oneof"`
 }
 
 func (*CryptoKey_RotationPeriod) isCryptoKey_RotationSchedule() {}
@@ -1181,22 +1181,22 @@ type CryptoKeyVersion struct {
 	Attestation *KeyOperationAttestation `protobuf:"bytes,8,opt,name=attestation,proto3" json:"attestation,omitempty"`
 	// Output only. The time at which this
 	// [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time this
 	// [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]'s key material was
 	// generated.
-	GenerateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=generate_time,json=generateTime,proto3" json:"generate_time,omitempty"`
+	GenerateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=generate_time,json=generateTime,proto3" json:"generate_time,omitempty"`
 	// Output only. The time this
 	// [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]'s key material is
 	// scheduled for destruction. Only present if
 	// [state][google.cloud.kms.v1.CryptoKeyVersion.state] is
 	// [DESTROY_SCHEDULED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROY_SCHEDULED].
-	DestroyTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=destroy_time,json=destroyTime,proto3" json:"destroy_time,omitempty"`
+	DestroyTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=destroy_time,json=destroyTime,proto3" json:"destroy_time,omitempty"`
 	// Output only. The time this CryptoKeyVersion's key material was
 	// destroyed. Only present if
 	// [state][google.cloud.kms.v1.CryptoKeyVersion.state] is
 	// [DESTROYED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.DESTROYED].
-	DestroyEventTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=destroy_event_time,json=destroyEventTime,proto3" json:"destroy_event_time,omitempty"`
+	DestroyEventTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=destroy_event_time,json=destroyEventTime,proto3" json:"destroy_event_time,omitempty"`
 	// Output only. The name of the [ImportJob][google.cloud.kms.v1.ImportJob]
 	// used in the most recent import of this
 	// [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]. Only present if
@@ -1205,7 +1205,7 @@ type CryptoKeyVersion struct {
 	// Output only. The time at which this
 	// [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion]'s key material was
 	// most recently imported.
-	ImportTime *timestamp.Timestamp `protobuf:"bytes,15,opt,name=import_time,json=importTime,proto3" json:"import_time,omitempty"`
+	ImportTime *timestamppb.Timestamp `protobuf:"bytes,15,opt,name=import_time,json=importTime,proto3" json:"import_time,omitempty"`
 	// Output only. The root cause of the most recent import failure. Only present
 	// if [state][google.cloud.kms.v1.CryptoKeyVersion.state] is
 	// [IMPORT_FAILED][google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.IMPORT_FAILED].
@@ -1290,28 +1290,28 @@ func (x *CryptoKeyVersion) GetAttestation() *KeyOperationAttestation {
 	return nil
 }
 
-func (x *CryptoKeyVersion) GetCreateTime() *timestamp.Timestamp {
+func (x *CryptoKeyVersion) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CryptoKeyVersion) GetGenerateTime() *timestamp.Timestamp {
+func (x *CryptoKeyVersion) GetGenerateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.GenerateTime
 	}
 	return nil
 }
 
-func (x *CryptoKeyVersion) GetDestroyTime() *timestamp.Timestamp {
+func (x *CryptoKeyVersion) GetDestroyTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DestroyTime
 	}
 	return nil
 }
 
-func (x *CryptoKeyVersion) GetDestroyEventTime() *timestamp.Timestamp {
+func (x *CryptoKeyVersion) GetDestroyEventTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DestroyEventTime
 	}
@@ -1325,7 +1325,7 @@ func (x *CryptoKeyVersion) GetImportJob() string {
 	return ""
 }
 
-func (x *CryptoKeyVersion) GetImportTime() *timestamp.Timestamp {
+func (x *CryptoKeyVersion) GetImportTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ImportTime
 	}
@@ -1385,7 +1385,7 @@ type PublicKey struct {
 	// that support this type.
 	//
 	// NOTE: This field is in Beta.
-	PemCrc32C *wrappers.Int64Value `protobuf:"bytes,3,opt,name=pem_crc32c,json=pemCrc32c,proto3" json:"pem_crc32c,omitempty"`
+	PemCrc32C *wrapperspb.Int64Value `protobuf:"bytes,3,opt,name=pem_crc32c,json=pemCrc32c,proto3" json:"pem_crc32c,omitempty"`
 	// The [name][google.cloud.kms.v1.CryptoKeyVersion.name] of the
 	// [CryptoKeyVersion][google.cloud.kms.v1.CryptoKeyVersion] public key.
 	// Provided here for verification.
@@ -1443,7 +1443,7 @@ func (x *PublicKey) GetAlgorithm() CryptoKeyVersion_CryptoKeyVersionAlgorithm {
 	return CryptoKeyVersion_CRYPTO_KEY_VERSION_ALGORITHM_UNSPECIFIED
 }
 
-func (x *PublicKey) GetPemCrc32C() *wrappers.Int64Value {
+func (x *PublicKey) GetPemCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.PemCrc32C
 	}
@@ -1518,18 +1518,18 @@ type ImportJob struct {
 	ProtectionLevel ProtectionLevel `protobuf:"varint,9,opt,name=protection_level,json=protectionLevel,proto3,enum=google.cloud.kms.v1.ProtectionLevel" json:"protection_level,omitempty"`
 	// Output only. The time at which this
 	// [ImportJob][google.cloud.kms.v1.ImportJob] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time this [ImportJob][google.cloud.kms.v1.ImportJob]'s key
 	// material was generated.
-	GenerateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=generate_time,json=generateTime,proto3" json:"generate_time,omitempty"`
+	GenerateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=generate_time,json=generateTime,proto3" json:"generate_time,omitempty"`
 	// Output only. The time at which this
 	// [ImportJob][google.cloud.kms.v1.ImportJob] is scheduled for expiration and
 	// can no longer be used to import key material.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// Output only. The time this [ImportJob][google.cloud.kms.v1.ImportJob]
 	// expired. Only present if [state][google.cloud.kms.v1.ImportJob.state] is
 	// [EXPIRED][google.cloud.kms.v1.ImportJob.ImportJobState.EXPIRED].
-	ExpireEventTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=expire_event_time,json=expireEventTime,proto3" json:"expire_event_time,omitempty"`
+	ExpireEventTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=expire_event_time,json=expireEventTime,proto3" json:"expire_event_time,omitempty"`
 	// Output only. The current state of the
 	// [ImportJob][google.cloud.kms.v1.ImportJob], indicating if it can be used.
 	State ImportJob_ImportJobState `protobuf:"varint,6,opt,name=state,proto3,enum=google.cloud.kms.v1.ImportJob_ImportJobState" json:"state,omitempty"`
@@ -1599,28 +1599,28 @@ func (x *ImportJob) GetProtectionLevel() ProtectionLevel {
 	return ProtectionLevel_PROTECTION_LEVEL_UNSPECIFIED
 }
 
-func (x *ImportJob) GetCreateTime() *timestamp.Timestamp {
+func (x *ImportJob) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ImportJob) GetGenerateTime() *timestamp.Timestamp {
+func (x *ImportJob) GetGenerateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.GenerateTime
 	}
 	return nil
 }
 
-func (x *ImportJob) GetExpireTime() *timestamp.Timestamp {
+func (x *ImportJob) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
 	return nil
 }
 
-func (x *ImportJob) GetExpireEventTime() *timestamp.Timestamp {
+func (x *ImportJob) GetExpireEventTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireEventTime
 	}
@@ -2284,9 +2284,9 @@ var file_google_cloud_kms_v1_resources_proto_goTypes = []interface{}{
 	nil,                                               // 16: google.cloud.kms.v1.CryptoKey.LabelsEntry
 	(*KeyOperationAttestation_CertificateChains)(nil), // 17: google.cloud.kms.v1.KeyOperationAttestation.CertificateChains
 	(*ImportJob_WrappingPublicKey)(nil),               // 18: google.cloud.kms.v1.ImportJob.WrappingPublicKey
-	(*timestamp.Timestamp)(nil),                       // 19: google.protobuf.Timestamp
-	(*duration.Duration)(nil),                         // 20: google.protobuf.Duration
-	(*wrappers.Int64Value)(nil),                       // 21: google.protobuf.Int64Value
+	(*timestamppb.Timestamp)(nil),                     // 19: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                       // 20: google.protobuf.Duration
+	(*wrapperspb.Int64Value)(nil),                     // 21: google.protobuf.Int64Value
 }
 var file_google_cloud_kms_v1_resources_proto_depIdxs = []int32{
 	19, // 0: google.cloud.kms.v1.KeyRing.create_time:type_name -> google.protobuf.Timestamp
diff --git a/kms/apiv1/kmspb/service.pb.go b/kms/apiv1/kmspb/service.pb.go
index 31212344ed4..40f03c38350 100644
--- a/kms/apiv1/kmspb/service.pb.go
+++ b/kms/apiv1/kmspb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/kms/v1/service.proto
 
 package kmspb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -1468,7 +1468,7 @@ type UpdateCryptoKeyRequest struct {
 	// Required. [CryptoKey][google.cloud.kms.v1.CryptoKey] with updated values.
 	CryptoKey *CryptoKey `protobuf:"bytes,1,opt,name=crypto_key,json=cryptoKey,proto3" json:"crypto_key,omitempty"`
 	// Required. List of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCryptoKeyRequest) Reset() {
@@ -1510,7 +1510,7 @@ func (x *UpdateCryptoKeyRequest) GetCryptoKey() *CryptoKey {
 	return nil
 }
 
-func (x *UpdateCryptoKeyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCryptoKeyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1528,7 +1528,7 @@ type UpdateCryptoKeyVersionRequest struct {
 	// updated values.
 	CryptoKeyVersion *CryptoKeyVersion `protobuf:"bytes,1,opt,name=crypto_key_version,json=cryptoKeyVersion,proto3" json:"crypto_key_version,omitempty"`
 	// Required. List of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCryptoKeyVersionRequest) Reset() {
@@ -1570,7 +1570,7 @@ func (x *UpdateCryptoKeyVersionRequest) GetCryptoKeyVersion() *CryptoKeyVersion
 	return nil
 }
 
-func (x *UpdateCryptoKeyVersionRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCryptoKeyVersionRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1796,7 +1796,7 @@ type EncryptRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	PlaintextCrc32C *wrappers.Int64Value `protobuf:"bytes,7,opt,name=plaintext_crc32c,json=plaintextCrc32c,proto3" json:"plaintext_crc32c,omitempty"`
+	PlaintextCrc32C *wrapperspb.Int64Value `protobuf:"bytes,7,opt,name=plaintext_crc32c,json=plaintextCrc32c,proto3" json:"plaintext_crc32c,omitempty"`
 	// Optional. An optional CRC32C checksum of the
 	// [EncryptRequest.additional_authenticated_data][google.cloud.kms.v1.EncryptRequest.additional_authenticated_data].
 	// If specified,
@@ -1816,7 +1816,7 @@ type EncryptRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	AdditionalAuthenticatedDataCrc32C *wrappers.Int64Value `protobuf:"bytes,8,opt,name=additional_authenticated_data_crc32c,json=additionalAuthenticatedDataCrc32c,proto3" json:"additional_authenticated_data_crc32c,omitempty"`
+	AdditionalAuthenticatedDataCrc32C *wrapperspb.Int64Value `protobuf:"bytes,8,opt,name=additional_authenticated_data_crc32c,json=additionalAuthenticatedDataCrc32c,proto3" json:"additional_authenticated_data_crc32c,omitempty"`
 }
 
 func (x *EncryptRequest) Reset() {
@@ -1872,14 +1872,14 @@ func (x *EncryptRequest) GetAdditionalAuthenticatedData() []byte {
 	return nil
 }
 
-func (x *EncryptRequest) GetPlaintextCrc32C() *wrappers.Int64Value {
+func (x *EncryptRequest) GetPlaintextCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.PlaintextCrc32C
 	}
 	return nil
 }
 
-func (x *EncryptRequest) GetAdditionalAuthenticatedDataCrc32C() *wrappers.Int64Value {
+func (x *EncryptRequest) GetAdditionalAuthenticatedDataCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.AdditionalAuthenticatedDataCrc32C
 	}
@@ -1922,7 +1922,7 @@ type DecryptRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	CiphertextCrc32C *wrappers.Int64Value `protobuf:"bytes,5,opt,name=ciphertext_crc32c,json=ciphertextCrc32c,proto3" json:"ciphertext_crc32c,omitempty"`
+	CiphertextCrc32C *wrapperspb.Int64Value `protobuf:"bytes,5,opt,name=ciphertext_crc32c,json=ciphertextCrc32c,proto3" json:"ciphertext_crc32c,omitempty"`
 	// Optional. An optional CRC32C checksum of the
 	// [DecryptRequest.additional_authenticated_data][google.cloud.kms.v1.DecryptRequest.additional_authenticated_data].
 	// If specified,
@@ -1942,7 +1942,7 @@ type DecryptRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	AdditionalAuthenticatedDataCrc32C *wrappers.Int64Value `protobuf:"bytes,6,opt,name=additional_authenticated_data_crc32c,json=additionalAuthenticatedDataCrc32c,proto3" json:"additional_authenticated_data_crc32c,omitempty"`
+	AdditionalAuthenticatedDataCrc32C *wrapperspb.Int64Value `protobuf:"bytes,6,opt,name=additional_authenticated_data_crc32c,json=additionalAuthenticatedDataCrc32c,proto3" json:"additional_authenticated_data_crc32c,omitempty"`
 }
 
 func (x *DecryptRequest) Reset() {
@@ -1998,14 +1998,14 @@ func (x *DecryptRequest) GetAdditionalAuthenticatedData() []byte {
 	return nil
 }
 
-func (x *DecryptRequest) GetCiphertextCrc32C() *wrappers.Int64Value {
+func (x *DecryptRequest) GetCiphertextCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.CiphertextCrc32C
 	}
 	return nil
 }
 
-func (x *DecryptRequest) GetAdditionalAuthenticatedDataCrc32C() *wrappers.Int64Value {
+func (x *DecryptRequest) GetAdditionalAuthenticatedDataCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.AdditionalAuthenticatedDataCrc32C
 	}
@@ -2050,7 +2050,7 @@ type AsymmetricSignRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	DigestCrc32C *wrappers.Int64Value `protobuf:"bytes,4,opt,name=digest_crc32c,json=digestCrc32c,proto3" json:"digest_crc32c,omitempty"`
+	DigestCrc32C *wrapperspb.Int64Value `protobuf:"bytes,4,opt,name=digest_crc32c,json=digestCrc32c,proto3" json:"digest_crc32c,omitempty"`
 	// Optional. The data to sign.
 	// It can't be supplied if
 	// [AsymmetricSignRequest.digest][google.cloud.kms.v1.AsymmetricSignRequest.digest]
@@ -2075,7 +2075,7 @@ type AsymmetricSignRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	DataCrc32C *wrappers.Int64Value `protobuf:"bytes,7,opt,name=data_crc32c,json=dataCrc32c,proto3" json:"data_crc32c,omitempty"`
+	DataCrc32C *wrapperspb.Int64Value `protobuf:"bytes,7,opt,name=data_crc32c,json=dataCrc32c,proto3" json:"data_crc32c,omitempty"`
 }
 
 func (x *AsymmetricSignRequest) Reset() {
@@ -2124,7 +2124,7 @@ func (x *AsymmetricSignRequest) GetDigest() *Digest {
 	return nil
 }
 
-func (x *AsymmetricSignRequest) GetDigestCrc32C() *wrappers.Int64Value {
+func (x *AsymmetricSignRequest) GetDigestCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.DigestCrc32C
 	}
@@ -2138,7 +2138,7 @@ func (x *AsymmetricSignRequest) GetData() []byte {
 	return nil
 }
 
-func (x *AsymmetricSignRequest) GetDataCrc32C() *wrappers.Int64Value {
+func (x *AsymmetricSignRequest) GetDataCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.DataCrc32C
 	}
@@ -2179,7 +2179,7 @@ type AsymmetricDecryptRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	CiphertextCrc32C *wrappers.Int64Value `protobuf:"bytes,4,opt,name=ciphertext_crc32c,json=ciphertextCrc32c,proto3" json:"ciphertext_crc32c,omitempty"`
+	CiphertextCrc32C *wrapperspb.Int64Value `protobuf:"bytes,4,opt,name=ciphertext_crc32c,json=ciphertextCrc32c,proto3" json:"ciphertext_crc32c,omitempty"`
 }
 
 func (x *AsymmetricDecryptRequest) Reset() {
@@ -2228,7 +2228,7 @@ func (x *AsymmetricDecryptRequest) GetCiphertext() []byte {
 	return nil
 }
 
-func (x *AsymmetricDecryptRequest) GetCiphertextCrc32C() *wrappers.Int64Value {
+func (x *AsymmetricDecryptRequest) GetCiphertextCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.CiphertextCrc32C
 	}
@@ -2266,7 +2266,7 @@ type MacSignRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	DataCrc32C *wrappers.Int64Value `protobuf:"bytes,3,opt,name=data_crc32c,json=dataCrc32c,proto3" json:"data_crc32c,omitempty"`
+	DataCrc32C *wrapperspb.Int64Value `protobuf:"bytes,3,opt,name=data_crc32c,json=dataCrc32c,proto3" json:"data_crc32c,omitempty"`
 }
 
 func (x *MacSignRequest) Reset() {
@@ -2315,7 +2315,7 @@ func (x *MacSignRequest) GetData() []byte {
 	return nil
 }
 
-func (x *MacSignRequest) GetDataCrc32C() *wrappers.Int64Value {
+func (x *MacSignRequest) GetDataCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.DataCrc32C
 	}
@@ -2355,7 +2355,7 @@ type MacVerifyRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	DataCrc32C *wrappers.Int64Value `protobuf:"bytes,3,opt,name=data_crc32c,json=dataCrc32c,proto3" json:"data_crc32c,omitempty"`
+	DataCrc32C *wrapperspb.Int64Value `protobuf:"bytes,3,opt,name=data_crc32c,json=dataCrc32c,proto3" json:"data_crc32c,omitempty"`
 	// Required. The signature to verify.
 	Mac []byte `protobuf:"bytes,4,opt,name=mac,proto3" json:"mac,omitempty"`
 	// Optional. An optional CRC32C checksum of the
@@ -2374,7 +2374,7 @@ type MacVerifyRequest struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	MacCrc32C *wrappers.Int64Value `protobuf:"bytes,5,opt,name=mac_crc32c,json=macCrc32c,proto3" json:"mac_crc32c,omitempty"`
+	MacCrc32C *wrapperspb.Int64Value `protobuf:"bytes,5,opt,name=mac_crc32c,json=macCrc32c,proto3" json:"mac_crc32c,omitempty"`
 }
 
 func (x *MacVerifyRequest) Reset() {
@@ -2423,7 +2423,7 @@ func (x *MacVerifyRequest) GetData() []byte {
 	return nil
 }
 
-func (x *MacVerifyRequest) GetDataCrc32C() *wrappers.Int64Value {
+func (x *MacVerifyRequest) GetDataCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.DataCrc32C
 	}
@@ -2437,7 +2437,7 @@ func (x *MacVerifyRequest) GetMac() []byte {
 	return nil
 }
 
-func (x *MacVerifyRequest) GetMacCrc32C() *wrappers.Int64Value {
+func (x *MacVerifyRequest) GetMacCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.MacCrc32C
 	}
@@ -2544,7 +2544,7 @@ type EncryptResponse struct {
 	// across different languages. However, it is a non-negative integer, which
 	// will never exceed 2^32-1, and can be safely downconverted to uint32 in
 	// languages that support this type.
-	CiphertextCrc32C *wrappers.Int64Value `protobuf:"bytes,4,opt,name=ciphertext_crc32c,json=ciphertextCrc32c,proto3" json:"ciphertext_crc32c,omitempty"`
+	CiphertextCrc32C *wrapperspb.Int64Value `protobuf:"bytes,4,opt,name=ciphertext_crc32c,json=ciphertextCrc32c,proto3" json:"ciphertext_crc32c,omitempty"`
 	// Integrity verification field. A flag indicating whether
 	// [EncryptRequest.plaintext_crc32c][google.cloud.kms.v1.EncryptRequest.plaintext_crc32c]
 	// was received by
@@ -2627,7 +2627,7 @@ func (x *EncryptResponse) GetCiphertext() []byte {
 	return nil
 }
 
-func (x *EncryptResponse) GetCiphertextCrc32C() *wrappers.Int64Value {
+func (x *EncryptResponse) GetCiphertextCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.CiphertextCrc32C
 	}
@@ -2682,7 +2682,7 @@ type DecryptResponse struct {
 	// languages. However, it is a non-negative integer, which will never exceed
 	// 2^32-1, and can be safely downconverted to uint32 in languages that support
 	// this type.
-	PlaintextCrc32C *wrappers.Int64Value `protobuf:"bytes,2,opt,name=plaintext_crc32c,json=plaintextCrc32c,proto3" json:"plaintext_crc32c,omitempty"`
+	PlaintextCrc32C *wrapperspb.Int64Value `protobuf:"bytes,2,opt,name=plaintext_crc32c,json=plaintextCrc32c,proto3" json:"plaintext_crc32c,omitempty"`
 	// Whether the Decryption was performed using the primary key version.
 	UsedPrimary bool `protobuf:"varint,3,opt,name=used_primary,json=usedPrimary,proto3" json:"used_primary,omitempty"`
 	// The [ProtectionLevel][google.cloud.kms.v1.ProtectionLevel] of the
@@ -2730,7 +2730,7 @@ func (x *DecryptResponse) GetPlaintext() []byte {
 	return nil
 }
 
-func (x *DecryptResponse) GetPlaintextCrc32C() *wrappers.Int64Value {
+func (x *DecryptResponse) GetPlaintextCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.PlaintextCrc32C
 	}
@@ -2773,7 +2773,7 @@ type AsymmetricSignResponse struct {
 	// across different languages. However, it is a non-negative integer, which
 	// will never exceed 2^32-1, and can be safely downconverted to uint32 in
 	// languages that support this type.
-	SignatureCrc32C *wrappers.Int64Value `protobuf:"bytes,2,opt,name=signature_crc32c,json=signatureCrc32c,proto3" json:"signature_crc32c,omitempty"`
+	SignatureCrc32C *wrapperspb.Int64Value `protobuf:"bytes,2,opt,name=signature_crc32c,json=signatureCrc32c,proto3" json:"signature_crc32c,omitempty"`
 	// Integrity verification field. A flag indicating whether
 	// [AsymmetricSignRequest.digest_crc32c][google.cloud.kms.v1.AsymmetricSignRequest.digest_crc32c]
 	// was received by
@@ -2852,7 +2852,7 @@ func (x *AsymmetricSignResponse) GetSignature() []byte {
 	return nil
 }
 
-func (x *AsymmetricSignResponse) GetSignatureCrc32C() *wrappers.Int64Value {
+func (x *AsymmetricSignResponse) GetSignatureCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.SignatureCrc32C
 	}
@@ -2909,7 +2909,7 @@ type AsymmetricDecryptResponse struct {
 	// across different languages. However, it is a non-negative integer, which
 	// will never exceed 2^32-1, and can be safely downconverted to uint32 in
 	// languages that support this type.
-	PlaintextCrc32C *wrappers.Int64Value `protobuf:"bytes,2,opt,name=plaintext_crc32c,json=plaintextCrc32c,proto3" json:"plaintext_crc32c,omitempty"`
+	PlaintextCrc32C *wrapperspb.Int64Value `protobuf:"bytes,2,opt,name=plaintext_crc32c,json=plaintextCrc32c,proto3" json:"plaintext_crc32c,omitempty"`
 	// Integrity verification field. A flag indicating whether
 	// [AsymmetricDecryptRequest.ciphertext_crc32c][google.cloud.kms.v1.AsymmetricDecryptRequest.ciphertext_crc32c]
 	// was received by
@@ -2970,7 +2970,7 @@ func (x *AsymmetricDecryptResponse) GetPlaintext() []byte {
 	return nil
 }
 
-func (x *AsymmetricDecryptResponse) GetPlaintextCrc32C() *wrappers.Int64Value {
+func (x *AsymmetricDecryptResponse) GetPlaintextCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.PlaintextCrc32C
 	}
@@ -3017,7 +3017,7 @@ type MacSignResponse struct {
 	// across different languages. However, it is a non-negative integer, which
 	// will never exceed 2^32-1, and can be safely downconverted to uint32 in
 	// languages that support this type.
-	MacCrc32C *wrappers.Int64Value `protobuf:"bytes,3,opt,name=mac_crc32c,json=macCrc32c,proto3" json:"mac_crc32c,omitempty"`
+	MacCrc32C *wrapperspb.Int64Value `protobuf:"bytes,3,opt,name=mac_crc32c,json=macCrc32c,proto3" json:"mac_crc32c,omitempty"`
 	// Integrity verification field. A flag indicating whether
 	// [MacSignRequest.data_crc32c][google.cloud.kms.v1.MacSignRequest.data_crc32c]
 	// was received by
@@ -3084,7 +3084,7 @@ func (x *MacSignResponse) GetMac() []byte {
 	return nil
 }
 
-func (x *MacSignResponse) GetMacCrc32C() *wrappers.Int64Value {
+func (x *MacSignResponse) GetMacCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.MacCrc32C
 	}
@@ -3259,7 +3259,7 @@ type GenerateRandomBytesResponse struct {
 	// across different languages. However, it is a non-negative integer, which
 	// will never exceed 2^32-1, and can be safely downconverted to uint32 in
 	// languages that support this type.
-	DataCrc32C *wrappers.Int64Value `protobuf:"bytes,3,opt,name=data_crc32c,json=dataCrc32c,proto3" json:"data_crc32c,omitempty"`
+	DataCrc32C *wrapperspb.Int64Value `protobuf:"bytes,3,opt,name=data_crc32c,json=dataCrc32c,proto3" json:"data_crc32c,omitempty"`
 }
 
 func (x *GenerateRandomBytesResponse) Reset() {
@@ -3301,7 +3301,7 @@ func (x *GenerateRandomBytesResponse) GetData() []byte {
 	return nil
 }
 
-func (x *GenerateRandomBytesResponse) GetDataCrc32C() *wrappers.Int64Value {
+func (x *GenerateRandomBytesResponse) GetDataCrc32C() *wrapperspb.Int64Value {
 	if x != nil {
 		return x.DataCrc32C
 	}
@@ -4419,8 +4419,8 @@ var file_google_cloud_kms_v1_service_proto_goTypes = []interface{}{
 	(*CryptoKeyVersion)(nil),                        // 42: google.cloud.kms.v1.CryptoKeyVersion
 	(*ImportJob)(nil),                               // 43: google.cloud.kms.v1.ImportJob
 	(CryptoKeyVersion_CryptoKeyVersionAlgorithm)(0), // 44: google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionAlgorithm
-	(*field_mask.FieldMask)(nil),                    // 45: google.protobuf.FieldMask
-	(*wrappers.Int64Value)(nil),                     // 46: google.protobuf.Int64Value
+	(*fieldmaskpb.FieldMask)(nil),                   // 45: google.protobuf.FieldMask
+	(*wrapperspb.Int64Value)(nil),                   // 46: google.protobuf.Int64Value
 	(ProtectionLevel)(0),                            // 47: google.cloud.kms.v1.ProtectionLevel
 	(*PublicKey)(nil),                               // 48: google.cloud.kms.v1.PublicKey
 }
diff --git a/kms/go.mod b/kms/go.mod
index 8714cc9e079..3d1f259e3cf 100644
--- a/kms/go.mod
+++ b/kms/go.mod
@@ -3,12 +3,11 @@ module cloud.google.com/go/kms
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	cloud.google.com/go/iam v0.5.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go v0.105.0
+	cloud.google.com/go/iam v0.6.0
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.100.0
-	google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -16,12 +15,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
 	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/kms/go.sum b/kms/go.sum
index 3ae5d255777..a3f04579454 100644
--- a/kms/go.sum
+++ b/kms/go.sum
@@ -1,10 +1,11 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
-cloud.google.com/go/iam v0.5.0 h1:fz9X5zyTWBmamZsqvqZqD7khbifcZF/q+Z1J8pfhIUg=
-cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
+cloud.google.com/go/iam v0.6.0 h1:nsqQC88kT5Iwlm4MeNGTpfMWddp6NB/UOLFTH6m1QfQ=
+cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -41,6 +42,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -81,8 +83,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -98,8 +100,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/language/apiv1/doc.go b/language/apiv1/doc.go
index a4f424d10c6..cfe739b26fa 100644
--- a/language/apiv1/doc.go
+++ b/language/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &languagepb.AnalyzeSentimentRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/language/v1#AnalyzeSentimentRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/language/apiv1/languagepb#AnalyzeSentimentRequest.
 //	}
 //	resp, err := c.AnalyzeSentiment(ctx, req)
 //	if err != nil {
diff --git a/language/apiv1/language_client.go b/language/apiv1/language_client.go
index edb93717294..7a929afd0b7 100644
--- a/language/apiv1/language_client.go
+++ b/language/apiv1/language_client.go
@@ -21,11 +21,11 @@ import (
 	"math"
 	"time"
 
+	languagepb "cloud.google.com/go/language/apiv1/languagepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	languagepb "google.golang.org/genproto/googleapis/cloud/language/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/language/apiv1/language_client_example_test.go b/language/apiv1/language_client_example_test.go
index feb65b244d2..8c1e60c5014 100644
--- a/language/apiv1/language_client_example_test.go
+++ b/language/apiv1/language_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	language "cloud.google.com/go/language/apiv1"
-	languagepb "google.golang.org/genproto/googleapis/cloud/language/v1"
+	languagepb "cloud.google.com/go/language/apiv1/languagepb"
 )
 
 func ExampleNewClient() {
@@ -55,7 +55,7 @@ func ExampleClient_AnalyzeSentiment() {
 
 	req := &languagepb.AnalyzeSentimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/language/v1#AnalyzeSentimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/language/apiv1/languagepb#AnalyzeSentimentRequest.
 	}
 	resp, err := c.AnalyzeSentiment(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleClient_AnalyzeEntities() {
 
 	req := &languagepb.AnalyzeEntitiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/language/v1#AnalyzeEntitiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/language/apiv1/languagepb#AnalyzeEntitiesRequest.
 	}
 	resp, err := c.AnalyzeEntities(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleClient_AnalyzeEntitySentiment() {
 
 	req := &languagepb.AnalyzeEntitySentimentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/language/v1#AnalyzeEntitySentimentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/language/apiv1/languagepb#AnalyzeEntitySentimentRequest.
 	}
 	resp, err := c.AnalyzeEntitySentiment(ctx, req)
 	if err != nil {
@@ -130,7 +130,7 @@ func ExampleClient_AnalyzeSyntax() {
 
 	req := &languagepb.AnalyzeSyntaxRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/language/v1#AnalyzeSyntaxRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/language/apiv1/languagepb#AnalyzeSyntaxRequest.
 	}
 	resp, err := c.AnalyzeSyntax(ctx, req)
 	if err != nil {
@@ -155,7 +155,7 @@ func ExampleClient_ClassifyText() {
 
 	req := &languagepb.ClassifyTextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/language/v1#ClassifyTextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/language/apiv1/languagepb#ClassifyTextRequest.
 	}
 	resp, err := c.ClassifyText(ctx, req)
 	if err != nil {
@@ -180,7 +180,7 @@ func ExampleClient_AnnotateText() {
 
 	req := &languagepb.AnnotateTextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/language/v1#AnnotateTextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/language/apiv1/languagepb#AnnotateTextRequest.
 	}
 	resp, err := c.AnnotateText(ctx, req)
 	if err != nil {
diff --git a/language/apiv1/languagepb/language_service.pb.go b/language/apiv1/languagepb/language_service.pb.go
index bdefa605098..72737c7de61 100644
--- a/language/apiv1/languagepb/language_service.pb.go
+++ b/language/apiv1/languagepb/language_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/language/v1/language_service.proto
 
 package languagepb
diff --git a/language/go.mod b/language/go.mod
index f59e1899148..695d9cd5335 100644
--- a/language/go.mod
+++ b/language/go.mod
@@ -3,10 +3,10 @@ module cloud.google.com/go/language
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go v0.105.0
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -18,9 +18,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/language/go.sum b/language/go.sum
index 8784b2a0c77..9ebb2713a7a 100644
--- a/language/go.sum
+++ b/language/go.sum
@@ -1,8 +1,9 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -39,6 +40,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/longrunning/aliasshim/aliasshim.go b/longrunning/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/longrunning/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/longrunning/autogen/doc.go b/longrunning/autogen/doc.go
index 0e1d43f6986..a3c2461ea3b 100644
--- a/longrunning/autogen/doc.go
+++ b/longrunning/autogen/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &longrunningpb.ListOperationsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/longrunning#ListOperationsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/longrunning/autogen/longrunningpb#ListOperationsRequest.
 //	}
 //	it := c.ListOperations(ctx, req)
 //	for {
diff --git a/longrunning/autogen/longrunningpb/operations.pb.go b/longrunning/autogen/longrunningpb/operations.pb.go
index ce4694c900e..6f3ae542be8 100644
--- a/longrunning/autogen/longrunningpb/operations.pb.go
+++ b/longrunning/autogen/longrunningpb/operations.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/longrunning/operations.proto
 
 package longrunningpb
@@ -25,10 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	any1 "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"
@@ -36,6 +32,10 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	descriptorpb "google.golang.org/protobuf/types/descriptorpb"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -60,7 +60,7 @@ type Operation struct {
 	// contains progress information and common metadata such as create time.
 	// Some services might not provide such metadata.  Any method that returns a
 	// long-running operation should document the metadata type, if any.
-	Metadata *any1.Any `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"`
+	Metadata *anypb.Any `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"`
 	// If the value is `false`, it means the operation is still in progress.
 	// If `true`, the operation is completed, and either `error` or `response` is
 	// available.
@@ -115,7 +115,7 @@ func (x *Operation) GetName() string {
 	return ""
 }
 
-func (x *Operation) GetMetadata() *any1.Any {
+func (x *Operation) GetMetadata() *anypb.Any {
 	if x != nil {
 		return x.Metadata
 	}
@@ -143,7 +143,7 @@ func (x *Operation) GetError() *status.Status {
 	return nil
 }
 
-func (x *Operation) GetResponse() *any1.Any {
+func (x *Operation) GetResponse() *anypb.Any {
 	if x, ok := x.GetResult().(*Operation_Response); ok {
 		return x.Response
 	}
@@ -168,7 +168,7 @@ type Operation_Response struct {
 	// is the original method name.  For example, if the original method name
 	// is `TakeSnapshot()`, the inferred response type is
 	// `TakeSnapshotResponse`.
-	Response *any1.Any `protobuf:"bytes,5,opt,name=response,proto3,oneof"`
+	Response *anypb.Any `protobuf:"bytes,5,opt,name=response,proto3,oneof"`
 }
 
 func (*Operation_Error) isOperation_Result() {}
@@ -467,7 +467,7 @@ type WaitOperationRequest struct {
 	// The maximum duration to wait before timing out. If left blank, the wait
 	// will be at most the time permitted by the underlying HTTP/RPC protocol.
 	// If RPC context deadline is also specified, the shorter one will be used.
-	Timeout *duration.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"`
 }
 
 func (x *WaitOperationRequest) Reset() {
@@ -509,7 +509,7 @@ func (x *WaitOperationRequest) GetName() string {
 	return ""
 }
 
-func (x *WaitOperationRequest) GetTimeout() *duration.Duration {
+func (x *WaitOperationRequest) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -599,7 +599,7 @@ func (x *OperationInfo) GetMetadataType() string {
 
 var file_google_longrunning_operations_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
-		ExtendedType:  (*descriptor.MethodOptions)(nil),
+		ExtendedType:  (*descriptorpb.MethodOptions)(nil),
 		ExtensionType: (*OperationInfo)(nil),
 		Field:         1049,
 		Name:          "google.longrunning.operation_info",
@@ -608,7 +608,7 @@ var file_google_longrunning_operations_proto_extTypes = []protoimpl.ExtensionInf
 	},
 }
 
-// Extension fields to descriptor.MethodOptions.
+// Extension fields to descriptorpb.MethodOptions.
 var (
 	// Additional information regarding long-running operations.
 	// In particular, this specifies the types that are returned from
@@ -766,19 +766,19 @@ func file_google_longrunning_operations_proto_rawDescGZIP() []byte {
 
 var file_google_longrunning_operations_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_google_longrunning_operations_proto_goTypes = []interface{}{
-	(*Operation)(nil),                // 0: google.longrunning.Operation
-	(*GetOperationRequest)(nil),      // 1: google.longrunning.GetOperationRequest
-	(*ListOperationsRequest)(nil),    // 2: google.longrunning.ListOperationsRequest
-	(*ListOperationsResponse)(nil),   // 3: google.longrunning.ListOperationsResponse
-	(*CancelOperationRequest)(nil),   // 4: google.longrunning.CancelOperationRequest
-	(*DeleteOperationRequest)(nil),   // 5: google.longrunning.DeleteOperationRequest
-	(*WaitOperationRequest)(nil),     // 6: google.longrunning.WaitOperationRequest
-	(*OperationInfo)(nil),            // 7: google.longrunning.OperationInfo
-	(*any1.Any)(nil),                 // 8: google.protobuf.Any
-	(*status.Status)(nil),            // 9: google.rpc.Status
-	(*duration.Duration)(nil),        // 10: google.protobuf.Duration
-	(*descriptor.MethodOptions)(nil), // 11: google.protobuf.MethodOptions
-	(*empty.Empty)(nil),              // 12: google.protobuf.Empty
+	(*Operation)(nil),                  // 0: google.longrunning.Operation
+	(*GetOperationRequest)(nil),        // 1: google.longrunning.GetOperationRequest
+	(*ListOperationsRequest)(nil),      // 2: google.longrunning.ListOperationsRequest
+	(*ListOperationsResponse)(nil),     // 3: google.longrunning.ListOperationsResponse
+	(*CancelOperationRequest)(nil),     // 4: google.longrunning.CancelOperationRequest
+	(*DeleteOperationRequest)(nil),     // 5: google.longrunning.DeleteOperationRequest
+	(*WaitOperationRequest)(nil),       // 6: google.longrunning.WaitOperationRequest
+	(*OperationInfo)(nil),              // 7: google.longrunning.OperationInfo
+	(*anypb.Any)(nil),                  // 8: google.protobuf.Any
+	(*status.Status)(nil),              // 9: google.rpc.Status
+	(*durationpb.Duration)(nil),        // 10: google.protobuf.Duration
+	(*descriptorpb.MethodOptions)(nil), // 11: google.protobuf.MethodOptions
+	(*emptypb.Empty)(nil),              // 12: google.protobuf.Empty
 }
 var file_google_longrunning_operations_proto_depIdxs = []int32{
 	8,  // 0: google.longrunning.Operation.metadata:type_name -> google.protobuf.Any
@@ -964,7 +964,7 @@ type OperationsClient interface {
 	// no longer interested in the operation result. It does not cancel the
 	// operation. If the server doesn't support this method, it returns
 	// `google.rpc.Code.UNIMPLEMENTED`.
-	DeleteOperation(ctx context.Context, in *DeleteOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteOperation(ctx context.Context, in *DeleteOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Starts asynchronous cancellation on a long-running operation.  The server
 	// makes a best effort to cancel the operation, but success is not
 	// guaranteed.  If the server doesn't support this method, it returns
@@ -975,7 +975,7 @@ type OperationsClient interface {
 	// the operation is not deleted; instead, it becomes an operation with
 	// an [Operation.error][google.longrunning.Operation.error] value with a [google.rpc.Status.code][google.rpc.Status.code] of 1,
 	// corresponding to `Code.CANCELLED`.
-	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Waits until the specified long-running operation is done or reaches at most
 	// a specified timeout, returning the latest state.  If the operation is
 	// already done, the latest state is immediately returned.  If the timeout
@@ -1014,8 +1014,8 @@ func (c *operationsClient) GetOperation(ctx context.Context, in *GetOperationReq
 	return out, nil
 }
 
-func (c *operationsClient) DeleteOperation(ctx context.Context, in *DeleteOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *operationsClient) DeleteOperation(ctx context.Context, in *DeleteOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.longrunning.Operations/DeleteOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1023,8 +1023,8 @@ func (c *operationsClient) DeleteOperation(ctx context.Context, in *DeleteOperat
 	return out, nil
 }
 
-func (c *operationsClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *operationsClient) CancelOperation(ctx context.Context, in *CancelOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.longrunning.Operations/CancelOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1062,7 +1062,7 @@ type OperationsServer interface {
 	// no longer interested in the operation result. It does not cancel the
 	// operation. If the server doesn't support this method, it returns
 	// `google.rpc.Code.UNIMPLEMENTED`.
-	DeleteOperation(context.Context, *DeleteOperationRequest) (*empty.Empty, error)
+	DeleteOperation(context.Context, *DeleteOperationRequest) (*emptypb.Empty, error)
 	// Starts asynchronous cancellation on a long-running operation.  The server
 	// makes a best effort to cancel the operation, but success is not
 	// guaranteed.  If the server doesn't support this method, it returns
@@ -1073,7 +1073,7 @@ type OperationsServer interface {
 	// the operation is not deleted; instead, it becomes an operation with
 	// an [Operation.error][google.longrunning.Operation.error] value with a [google.rpc.Status.code][google.rpc.Status.code] of 1,
 	// corresponding to `Code.CANCELLED`.
-	CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error)
+	CancelOperation(context.Context, *CancelOperationRequest) (*emptypb.Empty, error)
 	// Waits until the specified long-running operation is done or reaches at most
 	// a specified timeout, returning the latest state.  If the operation is
 	// already done, the latest state is immediately returned.  If the timeout
@@ -1096,10 +1096,10 @@ func (*UnimplementedOperationsServer) ListOperations(context.Context, *ListOpera
 func (*UnimplementedOperationsServer) GetOperation(context.Context, *GetOperationRequest) (*Operation, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method GetOperation not implemented")
 }
-func (*UnimplementedOperationsServer) DeleteOperation(context.Context, *DeleteOperationRequest) (*empty.Empty, error) {
+func (*UnimplementedOperationsServer) DeleteOperation(context.Context, *DeleteOperationRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteOperation not implemented")
 }
-func (*UnimplementedOperationsServer) CancelOperation(context.Context, *CancelOperationRequest) (*empty.Empty, error) {
+func (*UnimplementedOperationsServer) CancelOperation(context.Context, *CancelOperationRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method CancelOperation not implemented")
 }
 func (*UnimplementedOperationsServer) WaitOperation(context.Context, *WaitOperationRequest) (*Operation, error) {
diff --git a/longrunning/autogen/operations_client.go b/longrunning/autogen/operations_client.go
index b17a4035fc8..a04f1e341f4 100644
--- a/longrunning/autogen/operations_client.go
+++ b/longrunning/autogen/operations_client.go
@@ -26,6 +26,7 @@ import (
 	"net/url"
 	"time"
 
+	longrunningpb "cloud.google.com/go/longrunning/autogen/longrunningpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/googleapi"
 	"google.golang.org/api/iterator"
@@ -33,7 +34,6 @@ import (
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	httptransport "google.golang.org/api/transport/http"
-	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/longrunning/autogen/operations_client_example_test.go b/longrunning/autogen/operations_client_example_test.go
index 02f04b805d1..baf127c181f 100644
--- a/longrunning/autogen/operations_client_example_test.go
+++ b/longrunning/autogen/operations_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	longrunning "cloud.google.com/go/longrunning/autogen"
+	longrunningpb "cloud.google.com/go/longrunning/autogen/longrunningpb"
 	"google.golang.org/api/iterator"
-	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
 func ExampleNewOperationsClient() {
@@ -73,7 +73,7 @@ func ExampleOperationsClient_ListOperations() {
 
 	req := &longrunningpb.ListOperationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/longrunning#ListOperationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/longrunning/autogen/longrunningpb#ListOperationsRequest.
 	}
 	it := c.ListOperations(ctx, req)
 	for {
@@ -104,7 +104,7 @@ func ExampleOperationsClient_GetOperation() {
 
 	req := &longrunningpb.GetOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/longrunning#GetOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/longrunning/autogen/longrunningpb#GetOperationRequest.
 	}
 	resp, err := c.GetOperation(ctx, req)
 	if err != nil {
@@ -129,7 +129,7 @@ func ExampleOperationsClient_DeleteOperation() {
 
 	req := &longrunningpb.DeleteOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/longrunning#DeleteOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/longrunning/autogen/longrunningpb#DeleteOperationRequest.
 	}
 	err = c.DeleteOperation(ctx, req)
 	if err != nil {
@@ -152,7 +152,7 @@ func ExampleOperationsClient_CancelOperation() {
 
 	req := &longrunningpb.CancelOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/longrunning#CancelOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/longrunning/autogen/longrunningpb#CancelOperationRequest.
 	}
 	err = c.CancelOperation(ctx, req)
 	if err != nil {
@@ -175,7 +175,7 @@ func ExampleOperationsClient_WaitOperation() {
 
 	req := &longrunningpb.WaitOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/longrunning#WaitOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/longrunning/autogen/longrunningpb#WaitOperationRequest.
 	}
 	resp, err := c.WaitOperation(ctx, req)
 	if err != nil {
diff --git a/longrunning/go.mod b/longrunning/go.mod
index 3ef5b56f3bf..cf6fe233b23 100644
--- a/longrunning/go.mod
+++ b/longrunning/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.100.0
-	google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -21,6 +21,6 @@ require (
 	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/longrunning/go.sum b/longrunning/go.sum
index 59ef5783aa3..88005de0970 100644
--- a/longrunning/go.sum
+++ b/longrunning/go.sum
@@ -79,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -96,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/managedidentities/aliasshim/aliasshim.go b/managedidentities/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/managedidentities/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/managedidentities/apiv1/doc.go b/managedidentities/apiv1/doc.go
index 7bdc51f3760..457324a1dbd 100644
--- a/managedidentities/apiv1/doc.go
+++ b/managedidentities/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &managedidentitiespb.CreateMicrosoftAdDomainRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#CreateMicrosoftAdDomainRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#CreateMicrosoftAdDomainRequest.
 //	}
 //	op, err := c.CreateMicrosoftAdDomain(ctx, req)
 //	if err != nil {
diff --git a/managedidentities/apiv1/managed_identities_client.go b/managedidentities/apiv1/managed_identities_client.go
index e255be8dbb3..c09834956bc 100644
--- a/managedidentities/apiv1/managed_identities_client.go
+++ b/managedidentities/apiv1/managed_identities_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	managedidentitiespb "cloud.google.com/go/managedidentities/apiv1/managedidentitiespb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	managedidentitiespb "google.golang.org/genproto/googleapis/cloud/managedidentities/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/managedidentities/apiv1/managed_identities_client_example_test.go b/managedidentities/apiv1/managed_identities_client_example_test.go
index 559a54184dd..571af48cf90 100644
--- a/managedidentities/apiv1/managed_identities_client_example_test.go
+++ b/managedidentities/apiv1/managed_identities_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	managedidentities "cloud.google.com/go/managedidentities/apiv1"
+	managedidentitiespb "cloud.google.com/go/managedidentities/apiv1/managedidentitiespb"
 	"google.golang.org/api/iterator"
-	managedidentitiespb "google.golang.org/genproto/googleapis/cloud/managedidentities/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_CreateMicrosoftAdDomain() {
 
 	req := &managedidentitiespb.CreateMicrosoftAdDomainRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#CreateMicrosoftAdDomainRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#CreateMicrosoftAdDomainRequest.
 	}
 	op, err := c.CreateMicrosoftAdDomain(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleClient_ResetAdminPassword() {
 
 	req := &managedidentitiespb.ResetAdminPasswordRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#ResetAdminPasswordRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#ResetAdminPasswordRequest.
 	}
 	resp, err := c.ResetAdminPassword(ctx, req)
 	if err != nil {
@@ -111,7 +111,7 @@ func ExampleClient_ListDomains() {
 
 	req := &managedidentitiespb.ListDomainsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#ListDomainsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#ListDomainsRequest.
 	}
 	it := c.ListDomains(ctx, req)
 	for {
@@ -142,7 +142,7 @@ func ExampleClient_GetDomain() {
 
 	req := &managedidentitiespb.GetDomainRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#GetDomainRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#GetDomainRequest.
 	}
 	resp, err := c.GetDomain(ctx, req)
 	if err != nil {
@@ -167,7 +167,7 @@ func ExampleClient_UpdateDomain() {
 
 	req := &managedidentitiespb.UpdateDomainRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#UpdateDomainRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#UpdateDomainRequest.
 	}
 	op, err := c.UpdateDomain(ctx, req)
 	if err != nil {
@@ -197,7 +197,7 @@ func ExampleClient_DeleteDomain() {
 
 	req := &managedidentitiespb.DeleteDomainRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#DeleteDomainRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#DeleteDomainRequest.
 	}
 	op, err := c.DeleteDomain(ctx, req)
 	if err != nil {
@@ -225,7 +225,7 @@ func ExampleClient_AttachTrust() {
 
 	req := &managedidentitiespb.AttachTrustRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#AttachTrustRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#AttachTrustRequest.
 	}
 	op, err := c.AttachTrust(ctx, req)
 	if err != nil {
@@ -255,7 +255,7 @@ func ExampleClient_ReconfigureTrust() {
 
 	req := &managedidentitiespb.ReconfigureTrustRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#ReconfigureTrustRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#ReconfigureTrustRequest.
 	}
 	op, err := c.ReconfigureTrust(ctx, req)
 	if err != nil {
@@ -285,7 +285,7 @@ func ExampleClient_DetachTrust() {
 
 	req := &managedidentitiespb.DetachTrustRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#DetachTrustRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#DetachTrustRequest.
 	}
 	op, err := c.DetachTrust(ctx, req)
 	if err != nil {
@@ -315,7 +315,7 @@ func ExampleClient_ValidateTrust() {
 
 	req := &managedidentitiespb.ValidateTrustRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/managedidentities/v1#ValidateTrustRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/managedidentities/apiv1/managedidentitiespb#ValidateTrustRequest.
 	}
 	op, err := c.ValidateTrust(ctx, req)
 	if err != nil {
diff --git a/managedidentities/apiv1/managedidentitiespb/managed_identities_service.pb.go b/managedidentities/apiv1/managedidentitiespb/managed_identities_service.pb.go
index 59d978c4b33..8afafbf9a15 100644
--- a/managedidentities/apiv1/managedidentitiespb/managed_identities_service.pb.go
+++ b/managedidentities/apiv1/managedidentitiespb/managed_identities_service.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/managedidentities/v1/managed_identities_service.proto
 
 package managedidentitiespb
@@ -26,15 +26,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -51,9 +51,9 @@ type OpMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -99,14 +99,14 @@ func (*OpMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_managedidentities_v1_managed_identities_service_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *OpMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OpMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OpMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OpMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -551,7 +551,7 @@ type UpdateDomainRequest struct {
 	//   - `labels`
 	//   - `locations`
 	//   - `authorized_networks`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Domain message with updated fields. Only supported fields specified in
 	// update_mask are updated.
 	Domain *Domain `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"`
@@ -589,7 +589,7 @@ func (*UpdateDomainRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_managedidentities_v1_managed_identities_service_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *UpdateDomainRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateDomainRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1253,9 +1253,9 @@ var file_google_cloud_managedidentities_v1_managed_identities_service_proto_goTy
 	(*ReconfigureTrustRequest)(nil),        // 10: google.cloud.managedidentities.v1.ReconfigureTrustRequest
 	(*DetachTrustRequest)(nil),             // 11: google.cloud.managedidentities.v1.DetachTrustRequest
 	(*ValidateTrustRequest)(nil),           // 12: google.cloud.managedidentities.v1.ValidateTrustRequest
-	(*timestamp.Timestamp)(nil),            // 13: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 13: google.protobuf.Timestamp
 	(*Domain)(nil),                         // 14: google.cloud.managedidentities.v1.Domain
-	(*field_mask.FieldMask)(nil),           // 15: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),          // 15: google.protobuf.FieldMask
 	(*Trust)(nil),                          // 16: google.cloud.managedidentities.v1.Trust
 	(*longrunning.Operation)(nil),          // 17: google.longrunning.Operation
 }
diff --git a/managedidentities/apiv1/managedidentitiespb/resource.pb.go b/managedidentities/apiv1/managedidentitiespb/resource.pb.go
index e46a01da7b2..16dea801be9 100644
--- a/managedidentities/apiv1/managedidentitiespb/resource.pb.go
+++ b/managedidentities/apiv1/managedidentitiespb/resource.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/managedidentities/v1/resource.proto
 
 package managedidentitiespb
@@ -25,10 +25,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -326,9 +326,9 @@ type Domain struct {
 	// Active Directory set up on an internal network.
 	Fqdn string `protobuf:"bytes,10,opt,name=fqdn,proto3" json:"fqdn,omitempty"`
 	// Output only. The time the instance was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The current state of this domain.
 	State Domain_State `protobuf:"varint,13,opt,name=state,proto3,enum=google.cloud.managedidentities.v1.Domain_State" json:"state,omitempty"`
 	// Output only. Additional information about the current status of this
@@ -419,14 +419,14 @@ func (x *Domain) GetFqdn() string {
 	return ""
 }
 
-func (x *Domain) GetCreateTime() *timestamp.Timestamp {
+func (x *Domain) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Domain) GetUpdateTime() *timestamp.Timestamp {
+func (x *Domain) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -480,15 +480,15 @@ type Trust struct {
 	// not be stored.
 	TrustHandshakeSecret string `protobuf:"bytes,6,opt,name=trust_handshake_secret,json=trustHandshakeSecret,proto3" json:"trust_handshake_secret,omitempty"`
 	// Output only. The time the instance was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The current state of the trust.
 	State Trust_State `protobuf:"varint,9,opt,name=state,proto3,enum=google.cloud.managedidentities.v1.Trust_State" json:"state,omitempty"`
 	// Output only. Additional information about the current state of the trust, if available.
 	StateDescription string `protobuf:"bytes,11,opt,name=state_description,json=stateDescription,proto3" json:"state_description,omitempty"`
 	// Output only. The last heartbeat time when the trust was known to be connected.
-	LastTrustHeartbeatTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=last_trust_heartbeat_time,json=lastTrustHeartbeatTime,proto3" json:"last_trust_heartbeat_time,omitempty"`
+	LastTrustHeartbeatTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=last_trust_heartbeat_time,json=lastTrustHeartbeatTime,proto3" json:"last_trust_heartbeat_time,omitempty"`
 }
 
 func (x *Trust) Reset() {
@@ -565,14 +565,14 @@ func (x *Trust) GetTrustHandshakeSecret() string {
 	return ""
 }
 
-func (x *Trust) GetCreateTime() *timestamp.Timestamp {
+func (x *Trust) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Trust) GetUpdateTime() *timestamp.Timestamp {
+func (x *Trust) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -593,7 +593,7 @@ func (x *Trust) GetStateDescription() string {
 	return ""
 }
 
-func (x *Trust) GetLastTrustHeartbeatTime() *timestamp.Timestamp {
+func (x *Trust) GetLastTrustHeartbeatTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastTrustHeartbeatTime
 	}
@@ -773,14 +773,14 @@ func file_google_cloud_managedidentities_v1_resource_proto_rawDescGZIP() []byte
 var file_google_cloud_managedidentities_v1_resource_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
 var file_google_cloud_managedidentities_v1_resource_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_google_cloud_managedidentities_v1_resource_proto_goTypes = []interface{}{
-	(Domain_State)(0),           // 0: google.cloud.managedidentities.v1.Domain.State
-	(Trust_State)(0),            // 1: google.cloud.managedidentities.v1.Trust.State
-	(Trust_TrustType)(0),        // 2: google.cloud.managedidentities.v1.Trust.TrustType
-	(Trust_TrustDirection)(0),   // 3: google.cloud.managedidentities.v1.Trust.TrustDirection
-	(*Domain)(nil),              // 4: google.cloud.managedidentities.v1.Domain
-	(*Trust)(nil),               // 5: google.cloud.managedidentities.v1.Trust
-	nil,                         // 6: google.cloud.managedidentities.v1.Domain.LabelsEntry
-	(*timestamp.Timestamp)(nil), // 7: google.protobuf.Timestamp
+	(Domain_State)(0),             // 0: google.cloud.managedidentities.v1.Domain.State
+	(Trust_State)(0),              // 1: google.cloud.managedidentities.v1.Trust.State
+	(Trust_TrustType)(0),          // 2: google.cloud.managedidentities.v1.Trust.TrustType
+	(Trust_TrustDirection)(0),     // 3: google.cloud.managedidentities.v1.Trust.TrustDirection
+	(*Domain)(nil),                // 4: google.cloud.managedidentities.v1.Domain
+	(*Trust)(nil),                 // 5: google.cloud.managedidentities.v1.Trust
+	nil,                           // 6: google.cloud.managedidentities.v1.Domain.LabelsEntry
+	(*timestamppb.Timestamp)(nil), // 7: google.protobuf.Timestamp
 }
 var file_google_cloud_managedidentities_v1_resource_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.managedidentities.v1.Domain.labels:type_name -> google.cloud.managedidentities.v1.Domain.LabelsEntry
diff --git a/managedidentities/go.mod b/managedidentities/go.mod
index 98c527de5ff..b4a60d0184c 100644
--- a/managedidentities/go.mod
+++ b/managedidentities/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/managedidentities
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/managedidentities/go.sum b/managedidentities/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/managedidentities/go.sum
+++ b/managedidentities/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/memcache/apiv1/cloud_memcache_client.go b/memcache/apiv1/cloud_memcache_client.go
index 944c14fe361..519dd14de1f 100644
--- a/memcache/apiv1/cloud_memcache_client.go
+++ b/memcache/apiv1/cloud_memcache_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	memcachepb "cloud.google.com/go/memcache/apiv1/memcachepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	memcachepb "google.golang.org/genproto/googleapis/cloud/memcache/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/memcache/apiv1/cloud_memcache_client_example_test.go b/memcache/apiv1/cloud_memcache_client_example_test.go
index 74e0abd1fe6..97bb6e073a8 100644
--- a/memcache/apiv1/cloud_memcache_client_example_test.go
+++ b/memcache/apiv1/cloud_memcache_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	memcache "cloud.google.com/go/memcache/apiv1"
+	memcachepb "cloud.google.com/go/memcache/apiv1/memcachepb"
 	"google.golang.org/api/iterator"
-	memcachepb "google.golang.org/genproto/googleapis/cloud/memcache/v1"
 )
 
 func ExampleNewCloudMemcacheClient() {
@@ -56,7 +56,7 @@ func ExampleCloudMemcacheClient_ListInstances() {
 
 	req := &memcachepb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/memcache/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/memcache/apiv1/memcachepb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleCloudMemcacheClient_GetInstance() {
 
 	req := &memcachepb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/memcache/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/memcache/apiv1/memcachepb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleCloudMemcacheClient_CreateInstance() {
 
 	req := &memcachepb.CreateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/memcache/v1#CreateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/memcache/apiv1/memcachepb#CreateInstanceRequest.
 	}
 	op, err := c.CreateInstance(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleCloudMemcacheClient_UpdateInstance() {
 
 	req := &memcachepb.UpdateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/memcache/v1#UpdateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/memcache/apiv1/memcachepb#UpdateInstanceRequest.
 	}
 	op, err := c.UpdateInstance(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleCloudMemcacheClient_UpdateParameters() {
 
 	req := &memcachepb.UpdateParametersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/memcache/v1#UpdateParametersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/memcache/apiv1/memcachepb#UpdateParametersRequest.
 	}
 	op, err := c.UpdateParameters(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleCloudMemcacheClient_DeleteInstance() {
 
 	req := &memcachepb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/memcache/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/memcache/apiv1/memcachepb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
@@ -230,7 +230,7 @@ func ExampleCloudMemcacheClient_ApplyParameters() {
 
 	req := &memcachepb.ApplyParametersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/memcache/v1#ApplyParametersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/memcache/apiv1/memcachepb#ApplyParametersRequest.
 	}
 	op, err := c.ApplyParameters(ctx, req)
 	if err != nil {
diff --git a/memcache/apiv1/doc.go b/memcache/apiv1/doc.go
index ea0b4138a78..3b2daa090b2 100644
--- a/memcache/apiv1/doc.go
+++ b/memcache/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &memcachepb.ListInstancesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/memcache/v1#ListInstancesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/memcache/apiv1/memcachepb#ListInstancesRequest.
 //	}
 //	it := c.ListInstances(ctx, req)
 //	for {
diff --git a/memcache/apiv1/memcachepb/cloud_memcache.pb.go b/memcache/apiv1/memcachepb/cloud_memcache.pb.go
index d836c8472f6..cf5c8506538 100644
--- a/memcache/apiv1/memcachepb/cloud_memcache.pb.go
+++ b/memcache/apiv1/memcachepb/cloud_memcache.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/memcache/v1/cloud_memcache.proto
 
 package memcachepb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -310,9 +310,9 @@ type Instance struct {
 	// Refer to [Node] message for more details.
 	MemcacheNodes []*Instance_Node `protobuf:"bytes,12,rep,name=memcache_nodes,json=memcacheNodes,proto3" json:"memcache_nodes,omitempty"`
 	// Output only. The time the instance was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the instance was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The state of this Memcached instance.
 	State Instance_State `protobuf:"varint,15,opt,name=state,proto3,enum=google.cloud.memcache.v1.Instance_State" json:"state,omitempty"`
 	// Output only. The full version of memcached server running on this instance.
@@ -428,14 +428,14 @@ func (x *Instance) GetMemcacheNodes() []*Instance_Node {
 	return nil
 }
 
-func (x *Instance) GetCreateTime() *timestamp.Timestamp {
+func (x *Instance) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Instance) GetUpdateTime() *timestamp.Timestamp {
+func (x *Instance) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -780,7 +780,7 @@ type UpdateInstanceRequest struct {
 
 	// Required. Mask of fields to update.
 	//   - `displayName`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. A Memcached Instance.
 	// Only fields specified in update_mask are updated.
 	Instance *Instance `protobuf:"bytes,2,opt,name=instance,proto3" json:"instance,omitempty"`
@@ -818,7 +818,7 @@ func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_memcache_v1_cloud_memcache_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *UpdateInstanceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateInstanceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -965,7 +965,7 @@ type UpdateParametersRequest struct {
 	// updated.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Required. Mask of fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// The parameters to apply to the instance.
 	Parameters *MemcacheParameters `protobuf:"bytes,3,opt,name=parameters,proto3" json:"parameters,omitempty"`
 }
@@ -1009,7 +1009,7 @@ func (x *UpdateParametersRequest) GetName() string {
 	return ""
 }
 
-func (x *UpdateParametersRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateParametersRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1090,9 +1090,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. Time when the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time when the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -1140,14 +1140,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_memcache_v1_cloud_memcache_proto_rawDescGZIP(), []int{10}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1812,8 +1812,8 @@ var file_google_cloud_memcache_v1_cloud_memcache_proto_goTypes = []interface{}{
 	(*Instance_InstanceMessage)(nil),   // 17: google.cloud.memcache.v1.Instance.InstanceMessage
 	nil,                                // 18: google.cloud.memcache.v1.Instance.LabelsEntry
 	nil,                                // 19: google.cloud.memcache.v1.MemcacheParameters.ParamsEntry
-	(*timestamp.Timestamp)(nil),        // 20: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),       // 21: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),      // 20: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),      // 21: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),      // 22: google.longrunning.Operation
 }
 var file_google_cloud_memcache_v1_cloud_memcache_proto_depIdxs = []int32{
diff --git a/memcache/go.mod b/memcache/go.mod
index 27c41be1761..142f085df0c 100644
--- a/memcache/go.mod
+++ b/memcache/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/memcache
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/memcache/go.sum b/memcache/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/memcache/go.sum
+++ b/memcache/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/metastore/apiv1/dataproc_metastore_client.go b/metastore/apiv1/dataproc_metastore_client.go
index c9bcaf70f35..9860fee34b5 100644
--- a/metastore/apiv1/dataproc_metastore_client.go
+++ b/metastore/apiv1/dataproc_metastore_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	metastorepb "cloud.google.com/go/metastore/apiv1/metastorepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	metastorepb "google.golang.org/genproto/googleapis/cloud/metastore/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/metastore/apiv1/dataproc_metastore_client_example_test.go b/metastore/apiv1/dataproc_metastore_client_example_test.go
index 2096849d6f5..62bcf1d5b99 100644
--- a/metastore/apiv1/dataproc_metastore_client_example_test.go
+++ b/metastore/apiv1/dataproc_metastore_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	metastore "cloud.google.com/go/metastore/apiv1"
+	metastorepb "cloud.google.com/go/metastore/apiv1/metastorepb"
 	"google.golang.org/api/iterator"
-	metastorepb "google.golang.org/genproto/googleapis/cloud/metastore/v1"
 )
 
 func ExampleNewDataprocMetastoreClient() {
@@ -56,7 +56,7 @@ func ExampleDataprocMetastoreClient_ListServices() {
 
 	req := &metastorepb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleDataprocMetastoreClient_GetService() {
 
 	req := &metastorepb.GetServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#GetServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#GetServiceRequest.
 	}
 	resp, err := c.GetService(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleDataprocMetastoreClient_CreateService() {
 
 	req := &metastorepb.CreateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#CreateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#CreateServiceRequest.
 	}
 	op, err := c.CreateService(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleDataprocMetastoreClient_UpdateService() {
 
 	req := &metastorepb.UpdateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#UpdateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#UpdateServiceRequest.
 	}
 	op, err := c.UpdateService(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleDataprocMetastoreClient_DeleteService() {
 
 	req := &metastorepb.DeleteServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#DeleteServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#DeleteServiceRequest.
 	}
 	op, err := c.DeleteService(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleDataprocMetastoreClient_ListMetadataImports() {
 
 	req := &metastorepb.ListMetadataImportsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#ListMetadataImportsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#ListMetadataImportsRequest.
 	}
 	it := c.ListMetadataImports(ctx, req)
 	for {
@@ -231,7 +231,7 @@ func ExampleDataprocMetastoreClient_GetMetadataImport() {
 
 	req := &metastorepb.GetMetadataImportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#GetMetadataImportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#GetMetadataImportRequest.
 	}
 	resp, err := c.GetMetadataImport(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleDataprocMetastoreClient_CreateMetadataImport() {
 
 	req := &metastorepb.CreateMetadataImportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#CreateMetadataImportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#CreateMetadataImportRequest.
 	}
 	op, err := c.CreateMetadataImport(ctx, req)
 	if err != nil {
@@ -286,7 +286,7 @@ func ExampleDataprocMetastoreClient_UpdateMetadataImport() {
 
 	req := &metastorepb.UpdateMetadataImportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#UpdateMetadataImportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#UpdateMetadataImportRequest.
 	}
 	op, err := c.UpdateMetadataImport(ctx, req)
 	if err != nil {
@@ -316,7 +316,7 @@ func ExampleDataprocMetastoreClient_ExportMetadata() {
 
 	req := &metastorepb.ExportMetadataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#ExportMetadataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#ExportMetadataRequest.
 	}
 	op, err := c.ExportMetadata(ctx, req)
 	if err != nil {
@@ -346,7 +346,7 @@ func ExampleDataprocMetastoreClient_RestoreService() {
 
 	req := &metastorepb.RestoreServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#RestoreServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#RestoreServiceRequest.
 	}
 	op, err := c.RestoreService(ctx, req)
 	if err != nil {
@@ -376,7 +376,7 @@ func ExampleDataprocMetastoreClient_ListBackups() {
 
 	req := &metastorepb.ListBackupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#ListBackupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#ListBackupsRequest.
 	}
 	it := c.ListBackups(ctx, req)
 	for {
@@ -407,7 +407,7 @@ func ExampleDataprocMetastoreClient_GetBackup() {
 
 	req := &metastorepb.GetBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#GetBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#GetBackupRequest.
 	}
 	resp, err := c.GetBackup(ctx, req)
 	if err != nil {
@@ -432,7 +432,7 @@ func ExampleDataprocMetastoreClient_CreateBackup() {
 
 	req := &metastorepb.CreateBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#CreateBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#CreateBackupRequest.
 	}
 	op, err := c.CreateBackup(ctx, req)
 	if err != nil {
@@ -462,7 +462,7 @@ func ExampleDataprocMetastoreClient_DeleteBackup() {
 
 	req := &metastorepb.DeleteBackupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#DeleteBackupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#DeleteBackupRequest.
 	}
 	op, err := c.DeleteBackup(ctx, req)
 	if err != nil {
diff --git a/metastore/apiv1/doc.go b/metastore/apiv1/doc.go
index 7b99260d6e1..76c7a401e70 100644
--- a/metastore/apiv1/doc.go
+++ b/metastore/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &metastorepb.ListServicesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/metastore/v1#ListServicesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/metastore/apiv1/metastorepb#ListServicesRequest.
 //	}
 //	it := c.ListServices(ctx, req)
 //	for {
diff --git a/metastore/apiv1/metastorepb/metastore.pb.go b/metastore/apiv1/metastorepb/metastore.pb.go
index b00c0ca0486..d8ab28ac834 100644
--- a/metastore/apiv1/metastorepb/metastore.pb.go
+++ b/metastore/apiv1/metastorepb/metastore.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/metastore/v1/metastore.proto
 
 package metastorepb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	dayofweek "google.golang.org/genproto/googleapis/type/dayofweek"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -656,9 +656,9 @@ type Service struct {
 	// `projects/{project_number}/locations/{location_id}/services/{service_id}`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time when the metastore service was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the metastore service was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// User-defined labels for the metastore service.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Immutable. The relative resource name of the VPC network on which the instance can be
@@ -745,14 +745,14 @@ func (x *Service) GetName() string {
 	return ""
 }
 
-func (x *Service) GetCreateTime() *timestamp.Timestamp {
+func (x *Service) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Service) GetUpdateTime() *timestamp.Timestamp {
+func (x *Service) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -863,7 +863,7 @@ type MaintenanceWindow struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The hour of day (0-23) when the window starts.
-	HourOfDay *wrappers.Int32Value `protobuf:"bytes,1,opt,name=hour_of_day,json=hourOfDay,proto3" json:"hour_of_day,omitempty"`
+	HourOfDay *wrapperspb.Int32Value `protobuf:"bytes,1,opt,name=hour_of_day,json=hourOfDay,proto3" json:"hour_of_day,omitempty"`
 	// The day of week, when the window starts.
 	DayOfWeek dayofweek.DayOfWeek `protobuf:"varint,2,opt,name=day_of_week,json=dayOfWeek,proto3,enum=google.type.DayOfWeek" json:"day_of_week,omitempty"`
 }
@@ -900,7 +900,7 @@ func (*MaintenanceWindow) Descriptor() ([]byte, []int) {
 	return file_google_cloud_metastore_v1_metastore_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *MaintenanceWindow) GetHourOfDay() *wrappers.Int32Value {
+func (x *MaintenanceWindow) GetHourOfDay() *wrapperspb.Int32Value {
 	if x != nil {
 		return x.HourOfDay
 	}
@@ -1209,11 +1209,11 @@ type MetadataImport struct {
 	// The description of the metadata import.
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The time when the metadata import was started.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the metadata import was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The time when the metadata import finished.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The current state of the metadata import.
 	State MetadataImport_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.cloud.metastore.v1.MetadataImport_State" json:"state,omitempty"`
 }
@@ -1278,21 +1278,21 @@ func (x *MetadataImport) GetDescription() string {
 	return ""
 }
 
-func (x *MetadataImport) GetCreateTime() *timestamp.Timestamp {
+func (x *MetadataImport) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *MetadataImport) GetUpdateTime() *timestamp.Timestamp {
+func (x *MetadataImport) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *MetadataImport) GetEndTime() *timestamp.Timestamp {
+func (x *MetadataImport) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1328,9 +1328,9 @@ type MetadataExport struct {
 	//	*MetadataExport_DestinationGcsUri
 	Destination isMetadataExport_Destination `protobuf_oneof:"destination"`
 	// Output only. The time when the export started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. The time when the export ended.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The current state of the export.
 	State MetadataExport_State `protobuf:"varint,3,opt,name=state,proto3,enum=google.cloud.metastore.v1.MetadataExport_State" json:"state,omitempty"`
 	// Output only. The type of the database dump.
@@ -1383,14 +1383,14 @@ func (x *MetadataExport) GetDestinationGcsUri() string {
 	return ""
 }
 
-func (x *MetadataExport) GetStartTime() *timestamp.Timestamp {
+func (x *MetadataExport) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *MetadataExport) GetEndTime() *timestamp.Timestamp {
+func (x *MetadataExport) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1435,9 +1435,9 @@ type Backup struct {
 	// `projects/{project_number}/locations/{location_id}/services/{service_id}/backups/{backup_id}`
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time when the backup was started.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the backup finished creating.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The current state of the backup.
 	State Backup_State `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.metastore.v1.Backup_State" json:"state,omitempty"`
 	// Output only. The revision of the service at the time of backup.
@@ -1487,14 +1487,14 @@ func (x *Backup) GetName() string {
 	return ""
 }
 
-func (x *Backup) GetCreateTime() *timestamp.Timestamp {
+func (x *Backup) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Backup) GetEndTime() *timestamp.Timestamp {
+func (x *Backup) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1536,9 +1536,9 @@ type Restore struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time when the restore started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. The time when the restore ended.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The current state of the restore.
 	State Restore_State `protobuf:"varint,3,opt,name=state,proto3,enum=google.cloud.metastore.v1.Restore_State" json:"state,omitempty"`
 	// Output only. The relative resource name of the metastore service backup to restore
@@ -1585,14 +1585,14 @@ func (*Restore) Descriptor() ([]byte, []int) {
 	return file_google_cloud_metastore_v1_metastore_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *Restore) GetStartTime() *timestamp.Timestamp {
+func (x *Restore) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Restore) GetEndTime() *timestamp.Timestamp {
+func (x *Restore) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1953,7 +1953,7 @@ type UpdateServiceRequest struct {
 	// metastore service resource by the update.
 	// Fields specified in the `update_mask` are relative to the resource (not
 	// to the full request). A field is overwritten if it is in the mask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The metastore service to update. The server only merges fields
 	// in the service if they are specified in `update_mask`.
 	//
@@ -2007,7 +2007,7 @@ func (*UpdateServiceRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_metastore_v1_metastore_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *UpdateServiceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateServiceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2426,7 +2426,7 @@ type UpdateMetadataImportRequest struct {
 	// metadata import resource by the update.
 	// Fields specified in the `update_mask` are relative to the resource (not
 	// to the full request). A field is overwritten if it is in the mask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The metadata import to update. The server only merges fields
 	// in the import if they are specified in `update_mask`.
 	//
@@ -2480,7 +2480,7 @@ func (*UpdateMetadataImportRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_metastore_v1_metastore_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *UpdateMetadataImportRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateMetadataImportRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3102,9 +3102,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -3152,14 +3152,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_metastore_v1_metastore_proto_rawDescGZIP(), []int{28}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -4290,10 +4290,10 @@ var file_google_cloud_metastore_v1_metastore_proto_goTypes = []interface{}{
 	nil,                                           // 42: google.cloud.metastore.v1.HiveMetastoreConfig.ConfigOverridesEntry
 	(*MetadataImport_DatabaseDump)(nil),           // 43: google.cloud.metastore.v1.MetadataImport.DatabaseDump
 	(*LocationMetadata_HiveMetastoreVersion)(nil), // 44: google.cloud.metastore.v1.LocationMetadata.HiveMetastoreVersion
-	(*timestamp.Timestamp)(nil),                   // 45: google.protobuf.Timestamp
-	(*wrappers.Int32Value)(nil),                   // 46: google.protobuf.Int32Value
+	(*timestamppb.Timestamp)(nil),                 // 45: google.protobuf.Timestamp
+	(*wrapperspb.Int32Value)(nil),                 // 46: google.protobuf.Int32Value
 	(dayofweek.DayOfWeek)(0),                      // 47: google.type.DayOfWeek
-	(*field_mask.FieldMask)(nil),                  // 48: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                 // 48: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),                 // 49: google.longrunning.Operation
 }
 var file_google_cloud_metastore_v1_metastore_proto_depIdxs = []int32{
diff --git a/metastore/go.mod b/metastore/go.mod
index 68dee22011e..c28a87626ff 100644
--- a/metastore/go.mod
+++ b/metastore/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/metastore
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/metastore/go.sum b/metastore/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/metastore/go.sum
+++ b/metastore/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/monitoring/aliasshim/aliasshim.go b/monitoring/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/monitoring/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/monitoring/apiv3/v2/alert_policy_client.go b/monitoring/apiv3/v2/alert_policy_client.go
index dbd5a428167..6c9ecc0b538 100644
--- a/monitoring/apiv3/v2/alert_policy_client.go
+++ b/monitoring/apiv3/v2/alert_policy_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/monitoring/apiv3/v2/alert_policy_client_example_test.go b/monitoring/apiv3/v2/alert_policy_client_example_test.go
index c2affd3b3b4..f24386303e5 100644
--- a/monitoring/apiv3/v2/alert_policy_client_example_test.go
+++ b/monitoring/apiv3/v2/alert_policy_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	monitoring "cloud.google.com/go/monitoring/apiv3/v2"
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	"google.golang.org/api/iterator"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 )
 
 func ExampleNewAlertPolicyClient() {
@@ -56,7 +56,7 @@ func ExampleAlertPolicyClient_ListAlertPolicies() {
 
 	req := &monitoringpb.ListAlertPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListAlertPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListAlertPoliciesRequest.
 	}
 	it := c.ListAlertPolicies(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleAlertPolicyClient_GetAlertPolicy() {
 
 	req := &monitoringpb.GetAlertPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetAlertPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetAlertPolicyRequest.
 	}
 	resp, err := c.GetAlertPolicy(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleAlertPolicyClient_CreateAlertPolicy() {
 
 	req := &monitoringpb.CreateAlertPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateAlertPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateAlertPolicyRequest.
 	}
 	resp, err := c.CreateAlertPolicy(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleAlertPolicyClient_DeleteAlertPolicy() {
 
 	req := &monitoringpb.DeleteAlertPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#DeleteAlertPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#DeleteAlertPolicyRequest.
 	}
 	err = c.DeleteAlertPolicy(ctx, req)
 	if err != nil {
@@ -160,7 +160,7 @@ func ExampleAlertPolicyClient_UpdateAlertPolicy() {
 
 	req := &monitoringpb.UpdateAlertPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#UpdateAlertPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#UpdateAlertPolicyRequest.
 	}
 	resp, err := c.UpdateAlertPolicy(ctx, req)
 	if err != nil {
diff --git a/monitoring/apiv3/v2/doc.go b/monitoring/apiv3/v2/doc.go
index 36b80038956..f94ea8053c8 100644
--- a/monitoring/apiv3/v2/doc.go
+++ b/monitoring/apiv3/v2/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &monitoringpb.ListAlertPoliciesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListAlertPoliciesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListAlertPoliciesRequest.
 //	}
 //	it := c.ListAlertPolicies(ctx, req)
 //	for {
diff --git a/monitoring/apiv3/v2/group_client.go b/monitoring/apiv3/v2/group_client.go
index e6f534a329d..4375e1b467f 100644
--- a/monitoring/apiv3/v2/group_client.go
+++ b/monitoring/apiv3/v2/group_client.go
@@ -23,13 +23,13 @@ import (
 	"net/url"
 	"time"
 
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/monitoring/apiv3/v2/group_client_example_test.go b/monitoring/apiv3/v2/group_client_example_test.go
index 375d2d5c742..b4b7e802e94 100644
--- a/monitoring/apiv3/v2/group_client_example_test.go
+++ b/monitoring/apiv3/v2/group_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	monitoring "cloud.google.com/go/monitoring/apiv3/v2"
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	"google.golang.org/api/iterator"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 )
 
 func ExampleNewGroupClient() {
@@ -56,7 +56,7 @@ func ExampleGroupClient_ListGroups() {
 
 	req := &monitoringpb.ListGroupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListGroupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListGroupsRequest.
 	}
 	it := c.ListGroups(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleGroupClient_GetGroup() {
 
 	req := &monitoringpb.GetGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetGroupRequest.
 	}
 	resp, err := c.GetGroup(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleGroupClient_CreateGroup() {
 
 	req := &monitoringpb.CreateGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateGroupRequest.
 	}
 	resp, err := c.CreateGroup(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleGroupClient_UpdateGroup() {
 
 	req := &monitoringpb.UpdateGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#UpdateGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#UpdateGroupRequest.
 	}
 	resp, err := c.UpdateGroup(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleGroupClient_DeleteGroup() {
 
 	req := &monitoringpb.DeleteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#DeleteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#DeleteGroupRequest.
 	}
 	err = c.DeleteGroup(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleGroupClient_ListGroupMembers() {
 
 	req := &monitoringpb.ListGroupMembersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListGroupMembersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListGroupMembersRequest.
 	}
 	it := c.ListGroupMembers(ctx, req)
 	for {
diff --git a/monitoring/apiv3/v2/metric_client.go b/monitoring/apiv3/v2/metric_client.go
index b046e9b346b..872d6d3743c 100644
--- a/monitoring/apiv3/v2/metric_client.go
+++ b/monitoring/apiv3/v2/metric_client.go
@@ -23,6 +23,7 @@ import (
 	"net/url"
 	"time"
 
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
@@ -30,7 +31,6 @@ import (
 	gtransport "google.golang.org/api/transport/grpc"
 	metricpb "google.golang.org/genproto/googleapis/api/metric"
 	monitoredrespb "google.golang.org/genproto/googleapis/api/monitoredres"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/monitoring/apiv3/v2/metric_client_example_test.go b/monitoring/apiv3/v2/metric_client_example_test.go
index 66af8c92f0e..b594bf92ede 100644
--- a/monitoring/apiv3/v2/metric_client_example_test.go
+++ b/monitoring/apiv3/v2/metric_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	monitoring "cloud.google.com/go/monitoring/apiv3/v2"
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	"google.golang.org/api/iterator"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 )
 
 func ExampleNewMetricClient() {
@@ -56,7 +56,7 @@ func ExampleMetricClient_ListMonitoredResourceDescriptors() {
 
 	req := &monitoringpb.ListMonitoredResourceDescriptorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListMonitoredResourceDescriptorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListMonitoredResourceDescriptorsRequest.
 	}
 	it := c.ListMonitoredResourceDescriptors(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleMetricClient_GetMonitoredResourceDescriptor() {
 
 	req := &monitoringpb.GetMonitoredResourceDescriptorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetMonitoredResourceDescriptorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetMonitoredResourceDescriptorRequest.
 	}
 	resp, err := c.GetMonitoredResourceDescriptor(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleMetricClient_ListMetricDescriptors() {
 
 	req := &monitoringpb.ListMetricDescriptorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListMetricDescriptorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListMetricDescriptorsRequest.
 	}
 	it := c.ListMetricDescriptors(ctx, req)
 	for {
@@ -143,7 +143,7 @@ func ExampleMetricClient_GetMetricDescriptor() {
 
 	req := &monitoringpb.GetMetricDescriptorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetMetricDescriptorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetMetricDescriptorRequest.
 	}
 	resp, err := c.GetMetricDescriptor(ctx, req)
 	if err != nil {
@@ -168,7 +168,7 @@ func ExampleMetricClient_CreateMetricDescriptor() {
 
 	req := &monitoringpb.CreateMetricDescriptorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateMetricDescriptorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateMetricDescriptorRequest.
 	}
 	resp, err := c.CreateMetricDescriptor(ctx, req)
 	if err != nil {
@@ -193,7 +193,7 @@ func ExampleMetricClient_DeleteMetricDescriptor() {
 
 	req := &monitoringpb.DeleteMetricDescriptorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#DeleteMetricDescriptorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#DeleteMetricDescriptorRequest.
 	}
 	err = c.DeleteMetricDescriptor(ctx, req)
 	if err != nil {
@@ -216,7 +216,7 @@ func ExampleMetricClient_ListTimeSeries() {
 
 	req := &monitoringpb.ListTimeSeriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListTimeSeriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListTimeSeriesRequest.
 	}
 	it := c.ListTimeSeries(ctx, req)
 	for {
@@ -247,7 +247,7 @@ func ExampleMetricClient_CreateTimeSeries() {
 
 	req := &monitoringpb.CreateTimeSeriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateTimeSeriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateTimeSeriesRequest.
 	}
 	err = c.CreateTimeSeries(ctx, req)
 	if err != nil {
@@ -270,7 +270,7 @@ func ExampleMetricClient_CreateServiceTimeSeries() {
 
 	req := &monitoringpb.CreateTimeSeriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateTimeSeriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateTimeSeriesRequest.
 	}
 	err = c.CreateServiceTimeSeries(ctx, req)
 	if err != nil {
diff --git a/monitoring/apiv3/v2/monitoringpb/alert.pb.go b/monitoring/apiv3/v2/monitoringpb/alert.pb.go
index 8f989e7a4f5..fb5e35f5d5d 100644
--- a/monitoring/apiv3/v2/monitoringpb/alert.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/alert.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/alert.proto
 
 package monitoringpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -220,7 +220,7 @@ type AlertPolicy struct {
 	// any assumption about the state if it has not been populated. The
 	// field should always be populated on List and Get operations, unless
 	// a field projection has been specified that strips it out.
-	Enabled *wrappers.BoolValue `protobuf:"bytes,17,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	Enabled *wrapperspb.BoolValue `protobuf:"bytes,17,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// Read-only description of how the alert policy is invalid. OK if the alert
 	// policy is valid. If not OK, the alert policy will not generate incidents.
 	Validity *status.Status `protobuf:"bytes,18,opt,name=validity,proto3" json:"validity,omitempty"`
@@ -319,7 +319,7 @@ func (x *AlertPolicy) GetCombiner() AlertPolicy_ConditionCombinerType {
 	return AlertPolicy_COMBINE_UNSPECIFIED
 }
 
-func (x *AlertPolicy) GetEnabled() *wrappers.BoolValue {
+func (x *AlertPolicy) GetEnabled() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.Enabled
 	}
@@ -604,7 +604,7 @@ type AlertPolicy_AlertStrategy struct {
 	NotificationRateLimit *AlertPolicy_AlertStrategy_NotificationRateLimit `protobuf:"bytes,1,opt,name=notification_rate_limit,json=notificationRateLimit,proto3" json:"notification_rate_limit,omitempty"`
 	// If an alert policy that was active has no data for this long, any open
 	// incidents will close
-	AutoClose *duration.Duration `protobuf:"bytes,3,opt,name=auto_close,json=autoClose,proto3" json:"auto_close,omitempty"`
+	AutoClose *durationpb.Duration `protobuf:"bytes,3,opt,name=auto_close,json=autoClose,proto3" json:"auto_close,omitempty"`
 }
 
 func (x *AlertPolicy_AlertStrategy) Reset() {
@@ -646,7 +646,7 @@ func (x *AlertPolicy_AlertStrategy) GetNotificationRateLimit() *AlertPolicy_Aler
 	return nil
 }
 
-func (x *AlertPolicy_AlertStrategy) GetAutoClose() *duration.Duration {
+func (x *AlertPolicy_AlertStrategy) GetAutoClose() *durationpb.Duration {
 	if x != nil {
 		return x.AutoClose
 	}
@@ -812,7 +812,7 @@ type AlertPolicy_Condition_MetricThreshold struct {
 	// `aggregations` field); a good duration is long enough so that a single
 	// outlier does not generate spurious alerts, but short enough that
 	// unhealthy states are detected and alerted on quickly.
-	Duration *duration.Duration `protobuf:"bytes,6,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,6,opt,name=duration,proto3" json:"duration,omitempty"`
 	// The number/percent of time series for which the comparison must hold
 	// in order for the condition to trigger. If unspecified, then the
 	// condition will trigger if the comparison is true for any of the
@@ -899,7 +899,7 @@ func (x *AlertPolicy_Condition_MetricThreshold) GetThresholdValue() float64 {
 	return 0
 }
 
-func (x *AlertPolicy_Condition_MetricThreshold) GetDuration() *duration.Duration {
+func (x *AlertPolicy_Condition_MetricThreshold) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -960,7 +960,7 @@ type AlertPolicy_Condition_MetricAbsence struct {
 	// If an invalid value is given, an
 	// error will be returned. The `Duration.nanos` field is
 	// ignored.
-	Duration *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
 	// The number/percent of time series for which the comparison must hold
 	// in order for the condition to trigger. If unspecified, then the
 	// condition will trigger if the comparison is true for any of the
@@ -1014,7 +1014,7 @@ func (x *AlertPolicy_Condition_MetricAbsence) GetAggregations() []*Aggregation {
 	return nil
 }
 
-func (x *AlertPolicy_Condition_MetricAbsence) GetDuration() *duration.Duration {
+func (x *AlertPolicy_Condition_MetricAbsence) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -1121,7 +1121,7 @@ type AlertPolicy_Condition_MonitoringQueryLanguageCondition struct {
 	// `aggregations` field); a good duration is long enough so that a single
 	// outlier does not generate spurious alerts, but short enough that
 	// unhealthy states are detected and alerted on quickly.
-	Duration *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
 	// The number/percent of time series for which the comparison must hold
 	// in order for the condition to trigger. If unspecified, then the
 	// condition will trigger if the comparison is true for any of the
@@ -1173,7 +1173,7 @@ func (x *AlertPolicy_Condition_MonitoringQueryLanguageCondition) GetQuery() stri
 	return ""
 }
 
-func (x *AlertPolicy_Condition_MonitoringQueryLanguageCondition) GetDuration() *duration.Duration {
+func (x *AlertPolicy_Condition_MonitoringQueryLanguageCondition) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -1202,7 +1202,7 @@ type AlertPolicy_AlertStrategy_NotificationRateLimit struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Not more than one notification per `period`.
-	Period *duration.Duration `protobuf:"bytes,1,opt,name=period,proto3" json:"period,omitempty"`
+	Period *durationpb.Duration `protobuf:"bytes,1,opt,name=period,proto3" json:"period,omitempty"`
 }
 
 func (x *AlertPolicy_AlertStrategy_NotificationRateLimit) Reset() {
@@ -1237,7 +1237,7 @@ func (*AlertPolicy_AlertStrategy_NotificationRateLimit) Descriptor() ([]byte, []
 	return file_google_monitoring_v3_alert_proto_rawDescGZIP(), []int{0, 2, 0}
 }
 
-func (x *AlertPolicy_AlertStrategy_NotificationRateLimit) GetPeriod() *duration.Duration {
+func (x *AlertPolicy_AlertStrategy_NotificationRateLimit) GetPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.Period
 	}
@@ -1562,10 +1562,10 @@ var file_google_monitoring_v3_alert_proto_goTypes = []interface{}{
 	(*AlertPolicy_Condition_MonitoringQueryLanguageCondition)(nil), // 11: google.monitoring.v3.AlertPolicy.Condition.MonitoringQueryLanguageCondition
 	nil, // 12: google.monitoring.v3.AlertPolicy.Condition.LogMatch.LabelExtractorsEntry
 	(*AlertPolicy_AlertStrategy_NotificationRateLimit)(nil), // 13: google.monitoring.v3.AlertPolicy.AlertStrategy.NotificationRateLimit
-	(*wrappers.BoolValue)(nil),                              // 14: google.protobuf.BoolValue
+	(*wrapperspb.BoolValue)(nil),                            // 14: google.protobuf.BoolValue
 	(*status.Status)(nil),                                   // 15: google.rpc.Status
 	(*MutationRecord)(nil),                                  // 16: google.monitoring.v3.MutationRecord
-	(*duration.Duration)(nil),                               // 17: google.protobuf.Duration
+	(*durationpb.Duration)(nil),                             // 17: google.protobuf.Duration
 	(*Aggregation)(nil),                                     // 18: google.monitoring.v3.Aggregation
 	(ComparisonType)(0),                                     // 19: google.monitoring.v3.ComparisonType
 }
diff --git a/monitoring/apiv3/v2/monitoringpb/alert_service.pb.go b/monitoring/apiv3/v2/monitoringpb/alert_service.pb.go
index 46e155af335..f47133df016 100644
--- a/monitoring/apiv3/v2/monitoringpb/alert_service.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/alert_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/alert_service.proto
 
 package monitoringpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -366,7 +366,7 @@ type UpdateAlertPolicyRequest struct {
 	//     the supplied condition includes the `name` field with that
 	//     `[CONDITION_ID]`. If the supplied condition omits the `name` field,
 	//     then a new `[CONDITION_ID]` is created.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The updated alerting policy or the updated values for the
 	// fields listed in `update_mask`.
 	// If `update_mask` is not empty, any fields in this policy that are
@@ -406,7 +406,7 @@ func (*UpdateAlertPolicyRequest) Descriptor() ([]byte, []int) {
 	return file_google_monitoring_v3_alert_service_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *UpdateAlertPolicyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAlertPolicyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -653,8 +653,8 @@ var file_google_monitoring_v3_alert_service_proto_goTypes = []interface{}{
 	(*UpdateAlertPolicyRequest)(nil),  // 4: google.monitoring.v3.UpdateAlertPolicyRequest
 	(*DeleteAlertPolicyRequest)(nil),  // 5: google.monitoring.v3.DeleteAlertPolicyRequest
 	(*AlertPolicy)(nil),               // 6: google.monitoring.v3.AlertPolicy
-	(*field_mask.FieldMask)(nil),      // 7: google.protobuf.FieldMask
-	(*empty.Empty)(nil),               // 8: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),     // 7: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),             // 8: google.protobuf.Empty
 }
 var file_google_monitoring_v3_alert_service_proto_depIdxs = []int32{
 	6, // 0: google.monitoring.v3.CreateAlertPolicyRequest.alert_policy:type_name -> google.monitoring.v3.AlertPolicy
@@ -797,7 +797,7 @@ type AlertPolicyServiceClient interface {
 	// Creates a new alerting policy.
 	CreateAlertPolicy(ctx context.Context, in *CreateAlertPolicyRequest, opts ...grpc.CallOption) (*AlertPolicy, error)
 	// Deletes an alerting policy.
-	DeleteAlertPolicy(ctx context.Context, in *DeleteAlertPolicyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAlertPolicy(ctx context.Context, in *DeleteAlertPolicyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates an alerting policy. You can either replace the entire policy with
 	// a new one or replace only certain fields in the current alerting policy by
 	// specifying the fields to be updated via `updateMask`. Returns the
@@ -840,8 +840,8 @@ func (c *alertPolicyServiceClient) CreateAlertPolicy(ctx context.Context, in *Cr
 	return out, nil
 }
 
-func (c *alertPolicyServiceClient) DeleteAlertPolicy(ctx context.Context, in *DeleteAlertPolicyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *alertPolicyServiceClient) DeleteAlertPolicy(ctx context.Context, in *DeleteAlertPolicyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.AlertPolicyService/DeleteAlertPolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -867,7 +867,7 @@ type AlertPolicyServiceServer interface {
 	// Creates a new alerting policy.
 	CreateAlertPolicy(context.Context, *CreateAlertPolicyRequest) (*AlertPolicy, error)
 	// Deletes an alerting policy.
-	DeleteAlertPolicy(context.Context, *DeleteAlertPolicyRequest) (*empty.Empty, error)
+	DeleteAlertPolicy(context.Context, *DeleteAlertPolicyRequest) (*emptypb.Empty, error)
 	// Updates an alerting policy. You can either replace the entire policy with
 	// a new one or replace only certain fields in the current alerting policy by
 	// specifying the fields to be updated via `updateMask`. Returns the
@@ -888,7 +888,7 @@ func (*UnimplementedAlertPolicyServiceServer) GetAlertPolicy(context.Context, *G
 func (*UnimplementedAlertPolicyServiceServer) CreateAlertPolicy(context.Context, *CreateAlertPolicyRequest) (*AlertPolicy, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateAlertPolicy not implemented")
 }
-func (*UnimplementedAlertPolicyServiceServer) DeleteAlertPolicy(context.Context, *DeleteAlertPolicyRequest) (*empty.Empty, error) {
+func (*UnimplementedAlertPolicyServiceServer) DeleteAlertPolicy(context.Context, *DeleteAlertPolicyRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAlertPolicy not implemented")
 }
 func (*UnimplementedAlertPolicyServiceServer) UpdateAlertPolicy(context.Context, *UpdateAlertPolicyRequest) (*AlertPolicy, error) {
diff --git a/monitoring/apiv3/v2/monitoringpb/common.pb.go b/monitoring/apiv3/v2/monitoringpb/common.pb.go
index c591428c74c..d6c40bd7f96 100644
--- a/monitoring/apiv3/v2/monitoringpb/common.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/common.proto
 
 package monitoringpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	distribution "google.golang.org/genproto/googleapis/api/distribution"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -705,11 +705,11 @@ type TimeInterval struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. The end of the time interval.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Optional. The beginning of the time interval.  The default value
 	// for the start time is the end time. The start time must not be
 	// later than the end time.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 }
 
 func (x *TimeInterval) Reset() {
@@ -744,14 +744,14 @@ func (*TimeInterval) Descriptor() ([]byte, []int) {
 	return file_google_monitoring_v3_common_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *TimeInterval) GetEndTime() *timestamp.Timestamp {
+func (x *TimeInterval) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
 	return nil
 }
 
-func (x *TimeInterval) GetStartTime() *timestamp.Timestamp {
+func (x *TimeInterval) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -802,7 +802,7 @@ type Aggregation struct {
 	//
 	// The maximum value of the `alignment_period` is 104 weeks (2 years) for
 	// charts, and 90,000 seconds (25 hours) for alerting policies.
-	AlignmentPeriod *duration.Duration `protobuf:"bytes,1,opt,name=alignment_period,json=alignmentPeriod,proto3" json:"alignment_period,omitempty"`
+	AlignmentPeriod *durationpb.Duration `protobuf:"bytes,1,opt,name=alignment_period,json=alignmentPeriod,proto3" json:"alignment_period,omitempty"`
 	// An `Aligner` describes how to bring the data points in a single
 	// time series into temporal alignment. Except for `ALIGN_NONE`, all
 	// alignments cause all the data points in an `alignment_period` to be
@@ -884,7 +884,7 @@ func (*Aggregation) Descriptor() ([]byte, []int) {
 	return file_google_monitoring_v3_common_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *Aggregation) GetAlignmentPeriod() *duration.Duration {
+func (x *Aggregation) GetAlignmentPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.AlignmentPeriod
 	}
@@ -1066,8 +1066,8 @@ var file_google_monitoring_v3_common_proto_goTypes = []interface{}{
 	(*TimeInterval)(nil),              // 5: google.monitoring.v3.TimeInterval
 	(*Aggregation)(nil),               // 6: google.monitoring.v3.Aggregation
 	(*distribution.Distribution)(nil), // 7: google.api.Distribution
-	(*timestamp.Timestamp)(nil),       // 8: google.protobuf.Timestamp
-	(*duration.Duration)(nil),         // 9: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),     // 8: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),       // 9: google.protobuf.Duration
 }
 var file_google_monitoring_v3_common_proto_depIdxs = []int32{
 	7, // 0: google.monitoring.v3.TypedValue.distribution_value:type_name -> google.api.Distribution
diff --git a/monitoring/apiv3/v2/monitoringpb/dropped_labels.pb.go b/monitoring/apiv3/v2/monitoringpb/dropped_labels.pb.go
index 233b14f9f1c..1bdd70e3d92 100644
--- a/monitoring/apiv3/v2/monitoringpb/dropped_labels.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/dropped_labels.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/dropped_labels.proto
 
 package monitoringpb
diff --git a/monitoring/apiv3/v2/monitoringpb/group.pb.go b/monitoring/apiv3/v2/monitoringpb/group.pb.go
index 7648f1ea6fa..df1310325f3 100644
--- a/monitoring/apiv3/v2/monitoringpb/group.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/group.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/group.proto
 
 package monitoringpb
diff --git a/monitoring/apiv3/v2/monitoringpb/group_service.pb.go b/monitoring/apiv3/v2/monitoringpb/group_service.pb.go
index 76f5394f262..2340c1cb9c9 100644
--- a/monitoring/apiv3/v2/monitoringpb/group_service.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/group_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/group_service.proto
 
 package monitoringpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -884,7 +884,7 @@ var file_google_monitoring_v3_group_service_proto_goTypes = []interface{}{
 	(*Group)(nil),                          // 8: google.monitoring.v3.Group
 	(*TimeInterval)(nil),                   // 9: google.monitoring.v3.TimeInterval
 	(*monitoredres.MonitoredResource)(nil), // 10: google.api.MonitoredResource
-	(*empty.Empty)(nil),                    // 11: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                  // 11: google.protobuf.Empty
 }
 var file_google_monitoring_v3_group_service_proto_depIdxs = []int32{
 	8,  // 0: google.monitoring.v3.ListGroupsResponse.group:type_name -> google.monitoring.v3.Group
@@ -1063,7 +1063,7 @@ type GroupServiceClient interface {
 	// You can change any group attributes except `name`.
 	UpdateGroup(ctx context.Context, in *UpdateGroupRequest, opts ...grpc.CallOption) (*Group, error)
 	// Deletes an existing group.
-	DeleteGroup(ctx context.Context, in *DeleteGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteGroup(ctx context.Context, in *DeleteGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists the monitored resources that are members of a group.
 	ListGroupMembers(ctx context.Context, in *ListGroupMembersRequest, opts ...grpc.CallOption) (*ListGroupMembersResponse, error)
 }
@@ -1112,8 +1112,8 @@ func (c *groupServiceClient) UpdateGroup(ctx context.Context, in *UpdateGroupReq
 	return out, nil
 }
 
-func (c *groupServiceClient) DeleteGroup(ctx context.Context, in *DeleteGroupRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *groupServiceClient) DeleteGroup(ctx context.Context, in *DeleteGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.GroupService/DeleteGroup", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1142,7 +1142,7 @@ type GroupServiceServer interface {
 	// You can change any group attributes except `name`.
 	UpdateGroup(context.Context, *UpdateGroupRequest) (*Group, error)
 	// Deletes an existing group.
-	DeleteGroup(context.Context, *DeleteGroupRequest) (*empty.Empty, error)
+	DeleteGroup(context.Context, *DeleteGroupRequest) (*emptypb.Empty, error)
 	// Lists the monitored resources that are members of a group.
 	ListGroupMembers(context.Context, *ListGroupMembersRequest) (*ListGroupMembersResponse, error)
 }
@@ -1163,7 +1163,7 @@ func (*UnimplementedGroupServiceServer) CreateGroup(context.Context, *CreateGrou
 func (*UnimplementedGroupServiceServer) UpdateGroup(context.Context, *UpdateGroupRequest) (*Group, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateGroup not implemented")
 }
-func (*UnimplementedGroupServiceServer) DeleteGroup(context.Context, *DeleteGroupRequest) (*empty.Empty, error) {
+func (*UnimplementedGroupServiceServer) DeleteGroup(context.Context, *DeleteGroupRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteGroup not implemented")
 }
 func (*UnimplementedGroupServiceServer) ListGroupMembers(context.Context, *ListGroupMembersRequest) (*ListGroupMembersResponse, error) {
diff --git a/monitoring/apiv3/v2/monitoringpb/metric.pb.go b/monitoring/apiv3/v2/monitoringpb/metric.pb.go
index 89b00ad2c53..321e81afe7a 100644
--- a/monitoring/apiv3/v2/monitoringpb/metric.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/metric.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/metric.proto
 
 package monitoringpb
diff --git a/monitoring/apiv3/v2/monitoringpb/metric_service.pb.go b/monitoring/apiv3/v2/monitoringpb/metric_service.pb.go
index 05498d4b528..5939178fbba 100644
--- a/monitoring/apiv3/v2/monitoringpb/metric_service.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/metric_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/metric_service.proto
 
 package monitoringpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -35,6 +34,7 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -1782,7 +1782,7 @@ var file_google_monitoring_v3_metric_service_proto_goTypes = []interface{}{
 	(*TimeSeriesDescriptor)(nil),                     // 24: google.monitoring.v3.TimeSeriesDescriptor
 	(*TimeSeriesData)(nil),                           // 25: google.monitoring.v3.TimeSeriesData
 	(*QueryError)(nil),                               // 26: google.monitoring.v3.QueryError
-	(*empty.Empty)(nil),                              // 27: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                            // 27: google.protobuf.Empty
 }
 var file_google_monitoring_v3_metric_service_proto_depIdxs = []int32{
 	18, // 0: google.monitoring.v3.ListMonitoredResourceDescriptorsResponse.resource_descriptors:type_name -> google.api.MonitoredResourceDescriptor
@@ -2091,14 +2091,14 @@ type MetricServiceClient interface {
 	// Deletes a metric descriptor. Only user-created
 	// [custom metrics](https://cloud.google.com/monitoring/custom-metrics) can be
 	// deleted.
-	DeleteMetricDescriptor(ctx context.Context, in *DeleteMetricDescriptorRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteMetricDescriptor(ctx context.Context, in *DeleteMetricDescriptorRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists time series that match a filter. This method does not require a Workspace.
 	ListTimeSeries(ctx context.Context, in *ListTimeSeriesRequest, opts ...grpc.CallOption) (*ListTimeSeriesResponse, error)
 	// Creates or adds data to one or more time series.
 	// The response is empty if all time series in the request were written.
 	// If any time series could not be written, a corresponding failure message is
 	// included in the error response.
-	CreateTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	CreateTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates or adds data to one or more service time series. A service time
 	// series is a time series for a metric from a Google Cloud service. The
 	// response is empty if all time series in the request were written. If any
@@ -2108,7 +2108,7 @@ type MetricServiceClient interface {
 	// This method is only for use by Google Cloud services. Use
 	// [projects.timeSeries.create][google.monitoring.v3.MetricService.CreateTimeSeries]
 	// instead.
-	CreateServiceTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	CreateServiceTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type metricServiceClient struct {
@@ -2164,8 +2164,8 @@ func (c *metricServiceClient) CreateMetricDescriptor(ctx context.Context, in *Cr
 	return out, nil
 }
 
-func (c *metricServiceClient) DeleteMetricDescriptor(ctx context.Context, in *DeleteMetricDescriptorRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *metricServiceClient) DeleteMetricDescriptor(ctx context.Context, in *DeleteMetricDescriptorRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/DeleteMetricDescriptor", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2182,8 +2182,8 @@ func (c *metricServiceClient) ListTimeSeries(ctx context.Context, in *ListTimeSe
 	return out, nil
 }
 
-func (c *metricServiceClient) CreateTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *metricServiceClient) CreateTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/CreateTimeSeries", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2191,8 +2191,8 @@ func (c *metricServiceClient) CreateTimeSeries(ctx context.Context, in *CreateTi
 	return out, nil
 }
 
-func (c *metricServiceClient) CreateServiceTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *metricServiceClient) CreateServiceTimeSeries(ctx context.Context, in *CreateTimeSeriesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.MetricService/CreateServiceTimeSeries", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2219,14 +2219,14 @@ type MetricServiceServer interface {
 	// Deletes a metric descriptor. Only user-created
 	// [custom metrics](https://cloud.google.com/monitoring/custom-metrics) can be
 	// deleted.
-	DeleteMetricDescriptor(context.Context, *DeleteMetricDescriptorRequest) (*empty.Empty, error)
+	DeleteMetricDescriptor(context.Context, *DeleteMetricDescriptorRequest) (*emptypb.Empty, error)
 	// Lists time series that match a filter. This method does not require a Workspace.
 	ListTimeSeries(context.Context, *ListTimeSeriesRequest) (*ListTimeSeriesResponse, error)
 	// Creates or adds data to one or more time series.
 	// The response is empty if all time series in the request were written.
 	// If any time series could not be written, a corresponding failure message is
 	// included in the error response.
-	CreateTimeSeries(context.Context, *CreateTimeSeriesRequest) (*empty.Empty, error)
+	CreateTimeSeries(context.Context, *CreateTimeSeriesRequest) (*emptypb.Empty, error)
 	// Creates or adds data to one or more service time series. A service time
 	// series is a time series for a metric from a Google Cloud service. The
 	// response is empty if all time series in the request were written. If any
@@ -2236,7 +2236,7 @@ type MetricServiceServer interface {
 	// This method is only for use by Google Cloud services. Use
 	// [projects.timeSeries.create][google.monitoring.v3.MetricService.CreateTimeSeries]
 	// instead.
-	CreateServiceTimeSeries(context.Context, *CreateTimeSeriesRequest) (*empty.Empty, error)
+	CreateServiceTimeSeries(context.Context, *CreateTimeSeriesRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedMetricServiceServer can be embedded to have forward compatible implementations.
@@ -2258,16 +2258,16 @@ func (*UnimplementedMetricServiceServer) GetMetricDescriptor(context.Context, *G
 func (*UnimplementedMetricServiceServer) CreateMetricDescriptor(context.Context, *CreateMetricDescriptorRequest) (*metric.MetricDescriptor, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method CreateMetricDescriptor not implemented")
 }
-func (*UnimplementedMetricServiceServer) DeleteMetricDescriptor(context.Context, *DeleteMetricDescriptorRequest) (*empty.Empty, error) {
+func (*UnimplementedMetricServiceServer) DeleteMetricDescriptor(context.Context, *DeleteMetricDescriptorRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteMetricDescriptor not implemented")
 }
 func (*UnimplementedMetricServiceServer) ListTimeSeries(context.Context, *ListTimeSeriesRequest) (*ListTimeSeriesResponse, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method ListTimeSeries not implemented")
 }
-func (*UnimplementedMetricServiceServer) CreateTimeSeries(context.Context, *CreateTimeSeriesRequest) (*empty.Empty, error) {
+func (*UnimplementedMetricServiceServer) CreateTimeSeries(context.Context, *CreateTimeSeriesRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method CreateTimeSeries not implemented")
 }
-func (*UnimplementedMetricServiceServer) CreateServiceTimeSeries(context.Context, *CreateTimeSeriesRequest) (*empty.Empty, error) {
+func (*UnimplementedMetricServiceServer) CreateServiceTimeSeries(context.Context, *CreateTimeSeriesRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method CreateServiceTimeSeries not implemented")
 }
 
diff --git a/monitoring/apiv3/v2/monitoringpb/mutation_record.pb.go b/monitoring/apiv3/v2/monitoringpb/mutation_record.pb.go
index 3b10d4eb5f9..79e8485c034 100644
--- a/monitoring/apiv3/v2/monitoringpb/mutation_record.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/mutation_record.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/mutation_record.proto
 
 package monitoringpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -43,7 +43,7 @@ type MutationRecord struct {
 	unknownFields protoimpl.UnknownFields
 
 	// When the change occurred.
-	MutateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=mutate_time,json=mutateTime,proto3" json:"mutate_time,omitempty"`
+	MutateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=mutate_time,json=mutateTime,proto3" json:"mutate_time,omitempty"`
 	// The email address of the user making the change.
 	MutatedBy string `protobuf:"bytes,2,opt,name=mutated_by,json=mutatedBy,proto3" json:"mutated_by,omitempty"`
 }
@@ -80,7 +80,7 @@ func (*MutationRecord) Descriptor() ([]byte, []int) {
 	return file_google_monitoring_v3_mutation_record_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *MutationRecord) GetMutateTime() *timestamp.Timestamp {
+func (x *MutationRecord) GetMutateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.MutateTime
 	}
@@ -140,8 +140,8 @@ func file_google_monitoring_v3_mutation_record_proto_rawDescGZIP() []byte {
 
 var file_google_monitoring_v3_mutation_record_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_monitoring_v3_mutation_record_proto_goTypes = []interface{}{
-	(*MutationRecord)(nil),      // 0: google.monitoring.v3.MutationRecord
-	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+	(*MutationRecord)(nil),        // 0: google.monitoring.v3.MutationRecord
+	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 }
 var file_google_monitoring_v3_mutation_record_proto_depIdxs = []int32{
 	1, // 0: google.monitoring.v3.MutationRecord.mutate_time:type_name -> google.protobuf.Timestamp
diff --git a/monitoring/apiv3/v2/monitoringpb/notification.pb.go b/monitoring/apiv3/v2/monitoringpb/notification.pb.go
index c7267c1a390..722c9805645 100644
--- a/monitoring/apiv3/v2/monitoringpb/notification.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/notification.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/notification.proto
 
 package monitoringpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	api "google.golang.org/genproto/googleapis/api"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	label "google.golang.org/genproto/googleapis/api/label"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -295,7 +295,7 @@ type NotificationChannel struct {
 	// the channel. This is a more convenient approach when the change is
 	// temporary and you want to receive notifications from the same set
 	// of alerting policies on the channel at some point in the future.
-	Enabled *wrappers.BoolValue `protobuf:"bytes,11,opt,name=enabled,proto3" json:"enabled,omitempty"`
+	Enabled *wrapperspb.BoolValue `protobuf:"bytes,11,opt,name=enabled,proto3" json:"enabled,omitempty"`
 	// Record of the creation of this channel.
 	CreationRecord *MutationRecord `protobuf:"bytes,12,opt,name=creation_record,json=creationRecord,proto3" json:"creation_record,omitempty"`
 	// Records of the modification of this channel.
@@ -383,7 +383,7 @@ func (x *NotificationChannel) GetVerificationStatus() NotificationChannel_Verifi
 	return NotificationChannel_VERIFICATION_STATUS_UNSPECIFIED
 }
 
-func (x *NotificationChannel) GetEnabled() *wrappers.BoolValue {
+func (x *NotificationChannel) GetEnabled() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.Enabled
 	}
@@ -569,7 +569,7 @@ var file_google_monitoring_v3_notification_proto_goTypes = []interface{}{
 	(*label.LabelDescriptor)(nil),               // 5: google.api.LabelDescriptor
 	(ServiceTier)(0),                            // 6: google.monitoring.v3.ServiceTier
 	(api.LaunchStage)(0),                        // 7: google.api.LaunchStage
-	(*wrappers.BoolValue)(nil),                  // 8: google.protobuf.BoolValue
+	(*wrapperspb.BoolValue)(nil),                // 8: google.protobuf.BoolValue
 	(*MutationRecord)(nil),                      // 9: google.monitoring.v3.MutationRecord
 }
 var file_google_monitoring_v3_notification_proto_depIdxs = []int32{
diff --git a/monitoring/apiv3/v2/monitoringpb/notification_service.pb.go b/monitoring/apiv3/v2/monitoringpb/notification_service.pb.go
index bc917f7bc70..72821e4bdaf 100644
--- a/monitoring/apiv3/v2/monitoringpb/notification_service.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/notification_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/notification_service.proto
 
 package monitoringpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -540,7 +540,7 @@ type UpdateNotificationChannelRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The fields to update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. A description of the changes to be applied to the specified
 	// notification channel. The description must provide a definition for
 	// fields to be updated; the names of these fields should also be
@@ -580,7 +580,7 @@ func (*UpdateNotificationChannelRequest) Descriptor() ([]byte, []int) {
 	return file_google_monitoring_v3_notification_service_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *UpdateNotificationChannelRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateNotificationChannelRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -725,7 +725,7 @@ type GetNotificationChannelVerificationCodeRequest struct {
 	// permissible expiration (so specifying an expiration may extend the
 	// code's lifetime over omitting an expiration, even though the API does
 	// impose an upper limit on the maximum expiration that is permitted).
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *GetNotificationChannelVerificationCodeRequest) Reset() {
@@ -767,7 +767,7 @@ func (x *GetNotificationChannelVerificationCodeRequest) GetName() string {
 	return ""
 }
 
-func (x *GetNotificationChannelVerificationCodeRequest) GetExpireTime() *timestamp.Timestamp {
+func (x *GetNotificationChannelVerificationCodeRequest) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -788,7 +788,7 @@ type GetNotificationChannelVerificationCodeResponse struct {
 	// The expiration time associated with the code that was returned. If
 	// an expiration was provided in the request, this is the minimum of the
 	// requested expiration in the request and the max permitted expiration.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *GetNotificationChannelVerificationCodeResponse) Reset() {
@@ -830,7 +830,7 @@ func (x *GetNotificationChannelVerificationCodeResponse) GetCode() string {
 	return ""
 }
 
-func (x *GetNotificationChannelVerificationCodeResponse) GetExpireTime() *timestamp.Timestamp {
+func (x *GetNotificationChannelVerificationCodeResponse) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -1255,9 +1255,9 @@ var file_google_monitoring_v3_notification_service_proto_goTypes = []interface{}
 	(*VerifyNotificationChannelRequest)(nil),               // 12: google.monitoring.v3.VerifyNotificationChannelRequest
 	(*NotificationChannelDescriptor)(nil),                  // 13: google.monitoring.v3.NotificationChannelDescriptor
 	(*NotificationChannel)(nil),                            // 14: google.monitoring.v3.NotificationChannel
-	(*field_mask.FieldMask)(nil),                           // 15: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),                            // 16: google.protobuf.Timestamp
-	(*empty.Empty)(nil),                                    // 17: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),                          // 15: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                          // 16: google.protobuf.Timestamp
+	(*emptypb.Empty)(nil),                                  // 17: google.protobuf.Empty
 }
 var file_google_monitoring_v3_notification_service_proto_depIdxs = []int32{
 	13, // 0: google.monitoring.v3.ListNotificationChannelDescriptorsResponse.channel_descriptors:type_name -> google.monitoring.v3.NotificationChannelDescriptor
@@ -1511,10 +1511,10 @@ type NotificationChannelServiceClient interface {
 	// remain unchanged.
 	UpdateNotificationChannel(ctx context.Context, in *UpdateNotificationChannelRequest, opts ...grpc.CallOption) (*NotificationChannel, error)
 	// Deletes a notification channel.
-	DeleteNotificationChannel(ctx context.Context, in *DeleteNotificationChannelRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteNotificationChannel(ctx context.Context, in *DeleteNotificationChannelRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Causes a verification code to be delivered to the channel. The code
 	// can then be supplied in `VerifyNotificationChannel` to verify the channel.
-	SendNotificationChannelVerificationCode(ctx context.Context, in *SendNotificationChannelVerificationCodeRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	SendNotificationChannelVerificationCode(ctx context.Context, in *SendNotificationChannelVerificationCodeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Requests a verification code for an already verified channel that can then
 	// be used in a call to VerifyNotificationChannel() on a different channel
 	// with an equivalent identity in the same or in a different project. This
@@ -1605,8 +1605,8 @@ func (c *notificationChannelServiceClient) UpdateNotificationChannel(ctx context
 	return out, nil
 }
 
-func (c *notificationChannelServiceClient) DeleteNotificationChannel(ctx context.Context, in *DeleteNotificationChannelRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *notificationChannelServiceClient) DeleteNotificationChannel(ctx context.Context, in *DeleteNotificationChannelRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/DeleteNotificationChannel", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1614,8 +1614,8 @@ func (c *notificationChannelServiceClient) DeleteNotificationChannel(ctx context
 	return out, nil
 }
 
-func (c *notificationChannelServiceClient) SendNotificationChannelVerificationCode(ctx context.Context, in *SendNotificationChannelVerificationCodeRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *notificationChannelServiceClient) SendNotificationChannelVerificationCode(ctx context.Context, in *SendNotificationChannelVerificationCodeRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.NotificationChannelService/SendNotificationChannelVerificationCode", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1664,10 +1664,10 @@ type NotificationChannelServiceServer interface {
 	// remain unchanged.
 	UpdateNotificationChannel(context.Context, *UpdateNotificationChannelRequest) (*NotificationChannel, error)
 	// Deletes a notification channel.
-	DeleteNotificationChannel(context.Context, *DeleteNotificationChannelRequest) (*empty.Empty, error)
+	DeleteNotificationChannel(context.Context, *DeleteNotificationChannelRequest) (*emptypb.Empty, error)
 	// Causes a verification code to be delivered to the channel. The code
 	// can then be supplied in `VerifyNotificationChannel` to verify the channel.
-	SendNotificationChannelVerificationCode(context.Context, *SendNotificationChannelVerificationCodeRequest) (*empty.Empty, error)
+	SendNotificationChannelVerificationCode(context.Context, *SendNotificationChannelVerificationCodeRequest) (*emptypb.Empty, error)
 	// Requests a verification code for an already verified channel that can then
 	// be used in a call to VerifyNotificationChannel() on a different channel
 	// with an equivalent identity in the same or in a different project. This
@@ -1718,10 +1718,10 @@ func (*UnimplementedNotificationChannelServiceServer) CreateNotificationChannel(
 func (*UnimplementedNotificationChannelServiceServer) UpdateNotificationChannel(context.Context, *UpdateNotificationChannelRequest) (*NotificationChannel, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateNotificationChannel not implemented")
 }
-func (*UnimplementedNotificationChannelServiceServer) DeleteNotificationChannel(context.Context, *DeleteNotificationChannelRequest) (*empty.Empty, error) {
+func (*UnimplementedNotificationChannelServiceServer) DeleteNotificationChannel(context.Context, *DeleteNotificationChannelRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteNotificationChannel not implemented")
 }
-func (*UnimplementedNotificationChannelServiceServer) SendNotificationChannelVerificationCode(context.Context, *SendNotificationChannelVerificationCodeRequest) (*empty.Empty, error) {
+func (*UnimplementedNotificationChannelServiceServer) SendNotificationChannelVerificationCode(context.Context, *SendNotificationChannelVerificationCodeRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SendNotificationChannelVerificationCode not implemented")
 }
 func (*UnimplementedNotificationChannelServiceServer) GetNotificationChannelVerificationCode(context.Context, *GetNotificationChannelVerificationCodeRequest) (*GetNotificationChannelVerificationCodeResponse, error) {
diff --git a/monitoring/apiv3/v2/monitoringpb/query_service.pb.go b/monitoring/apiv3/v2/monitoringpb/query_service.pb.go
index 94378dd3593..7c62db39ea5 100644
--- a/monitoring/apiv3/v2/monitoringpb/query_service.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/query_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/query_service.proto
 
 package monitoringpb
diff --git a/monitoring/apiv3/v2/monitoringpb/service.pb.go b/monitoring/apiv3/v2/monitoringpb/service.pb.go
index d151ad7bd16..5d162598029 100644
--- a/monitoring/apiv3/v2/monitoringpb/service.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/service.proto
 
 package monitoringpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	calendarperiod "google.golang.org/genproto/googleapis/type/calendarperiod"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -400,7 +400,7 @@ func (m *ServiceLevelObjective) GetPeriod() isServiceLevelObjective_Period {
 	return nil
 }
 
-func (x *ServiceLevelObjective) GetRollingPeriod() *duration.Duration {
+func (x *ServiceLevelObjective) GetRollingPeriod() *durationpb.Duration {
 	if x, ok := x.GetPeriod().(*ServiceLevelObjective_RollingPeriod); ok {
 		return x.RollingPeriod
 	}
@@ -428,7 +428,7 @@ type isServiceLevelObjective_Period interface {
 type ServiceLevelObjective_RollingPeriod struct {
 	// A rolling time period, semantically "in the past `<rolling_period>`".
 	// Must be an integer multiple of 1 day no larger than 30 days.
-	RollingPeriod *duration.Duration `protobuf:"bytes,5,opt,name=rolling_period,json=rollingPeriod,proto3,oneof"`
+	RollingPeriod *durationpb.Duration `protobuf:"bytes,5,opt,name=rolling_period,json=rollingPeriod,proto3,oneof"`
 }
 
 type ServiceLevelObjective_CalendarPeriod struct {
@@ -1004,7 +1004,7 @@ type WindowsBasedSli struct {
 	WindowCriterion isWindowsBasedSli_WindowCriterion `protobuf_oneof:"window_criterion"`
 	// Duration over which window quality is evaluated. Must be an integer
 	// fraction of a day and at least `60s`.
-	WindowPeriod *duration.Duration `protobuf:"bytes,4,opt,name=window_period,json=windowPeriod,proto3" json:"window_period,omitempty"`
+	WindowPeriod *durationpb.Duration `protobuf:"bytes,4,opt,name=window_period,json=windowPeriod,proto3" json:"window_period,omitempty"`
 }
 
 func (x *WindowsBasedSli) Reset() {
@@ -1074,7 +1074,7 @@ func (x *WindowsBasedSli) GetMetricSumInRange() *WindowsBasedSli_MetricRange {
 	return nil
 }
 
-func (x *WindowsBasedSli) GetWindowPeriod() *duration.Duration {
+func (x *WindowsBasedSli) GetWindowPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.WindowPeriod
 	}
@@ -1587,7 +1587,7 @@ type BasicSli_LatencyCriteria struct {
 
 	// Good service is defined to be the count of requests made to this service
 	// that return in no more than `threshold`.
-	Threshold *duration.Duration `protobuf:"bytes,3,opt,name=threshold,proto3" json:"threshold,omitempty"`
+	Threshold *durationpb.Duration `protobuf:"bytes,3,opt,name=threshold,proto3" json:"threshold,omitempty"`
 }
 
 func (x *BasicSli_LatencyCriteria) Reset() {
@@ -1622,7 +1622,7 @@ func (*BasicSli_LatencyCriteria) Descriptor() ([]byte, []int) {
 	return file_google_monitoring_v3_service_proto_rawDescGZIP(), []int{3, 1}
 }
 
-func (x *BasicSli_LatencyCriteria) GetThreshold() *duration.Duration {
+func (x *BasicSli_LatencyCriteria) GetThreshold() *durationpb.Duration {
 	if x != nil {
 		return x.Threshold
 	}
@@ -2133,7 +2133,7 @@ var file_google_monitoring_v3_service_proto_goTypes = []interface{}{
 	(*BasicSli_LatencyCriteria)(nil),             // 20: google.monitoring.v3.BasicSli.LatencyCriteria
 	(*WindowsBasedSli_PerformanceThreshold)(nil), // 21: google.monitoring.v3.WindowsBasedSli.PerformanceThreshold
 	(*WindowsBasedSli_MetricRange)(nil),          // 22: google.monitoring.v3.WindowsBasedSli.MetricRange
-	(*duration.Duration)(nil),                    // 23: google.protobuf.Duration
+	(*durationpb.Duration)(nil),                  // 23: google.protobuf.Duration
 	(calendarperiod.CalendarPeriod)(0),           // 24: google.type.CalendarPeriod
 }
 var file_google_monitoring_v3_service_proto_depIdxs = []int32{
diff --git a/monitoring/apiv3/v2/monitoringpb/service_service.pb.go b/monitoring/apiv3/v2/monitoringpb/service_service.pb.go
index 34d0160dc68..e714a59b6a2 100644
--- a/monitoring/apiv3/v2/monitoringpb/service_service.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/service_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/service_service.proto
 
 package monitoringpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -336,7 +336,7 @@ type UpdateServiceRequest struct {
 	// The given `name` specifies the resource to update.
 	Service *Service `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"`
 	// A set of field paths defining which fields to use for the update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateServiceRequest) Reset() {
@@ -378,7 +378,7 @@ func (x *UpdateServiceRequest) GetService() *Service {
 	return nil
 }
 
-func (x *UpdateServiceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateServiceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -737,7 +737,7 @@ type UpdateServiceLevelObjectiveRequest struct {
 	// The given `name` specifies the resource to update.
 	ServiceLevelObjective *ServiceLevelObjective `protobuf:"bytes,1,opt,name=service_level_objective,json=serviceLevelObjective,proto3" json:"service_level_objective,omitempty"`
 	// A set of field paths defining which fields to use for the update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateServiceLevelObjectiveRequest) Reset() {
@@ -779,7 +779,7 @@ func (x *UpdateServiceLevelObjectiveRequest) GetServiceLevelObjective() *Service
 	return nil
 }
 
-func (x *UpdateServiceLevelObjectiveRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateServiceLevelObjectiveRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1154,10 +1154,10 @@ var file_google_monitoring_v3_service_service_proto_goTypes = []interface{}{
 	(*UpdateServiceLevelObjectiveRequest)(nil), // 10: google.monitoring.v3.UpdateServiceLevelObjectiveRequest
 	(*DeleteServiceLevelObjectiveRequest)(nil), // 11: google.monitoring.v3.DeleteServiceLevelObjectiveRequest
 	(*Service)(nil),                            // 12: google.monitoring.v3.Service
-	(*field_mask.FieldMask)(nil),               // 13: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),              // 13: google.protobuf.FieldMask
 	(*ServiceLevelObjective)(nil),              // 14: google.monitoring.v3.ServiceLevelObjective
 	(ServiceLevelObjective_View)(0),            // 15: google.monitoring.v3.ServiceLevelObjective.View
-	(*empty.Empty)(nil),                        // 16: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                      // 16: google.protobuf.Empty
 }
 var file_google_monitoring_v3_service_service_proto_depIdxs = []int32{
 	12, // 0: google.monitoring.v3.CreateServiceRequest.service:type_name -> google.monitoring.v3.Service
@@ -1390,7 +1390,7 @@ type ServiceMonitoringServiceClient interface {
 	// Update this `Service`.
 	UpdateService(ctx context.Context, in *UpdateServiceRequest, opts ...grpc.CallOption) (*Service, error)
 	// Soft delete this `Service`.
-	DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Create a `ServiceLevelObjective` for the given `Service`.
 	CreateServiceLevelObjective(ctx context.Context, in *CreateServiceLevelObjectiveRequest, opts ...grpc.CallOption) (*ServiceLevelObjective, error)
 	// Get a `ServiceLevelObjective` by name.
@@ -1400,7 +1400,7 @@ type ServiceMonitoringServiceClient interface {
 	// Update the given `ServiceLevelObjective`.
 	UpdateServiceLevelObjective(ctx context.Context, in *UpdateServiceLevelObjectiveRequest, opts ...grpc.CallOption) (*ServiceLevelObjective, error)
 	// Delete the given `ServiceLevelObjective`.
-	DeleteServiceLevelObjective(ctx context.Context, in *DeleteServiceLevelObjectiveRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteServiceLevelObjective(ctx context.Context, in *DeleteServiceLevelObjectiveRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type serviceMonitoringServiceClient struct {
@@ -1447,8 +1447,8 @@ func (c *serviceMonitoringServiceClient) UpdateService(ctx context.Context, in *
 	return out, nil
 }
 
-func (c *serviceMonitoringServiceClient) DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *serviceMonitoringServiceClient) DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.ServiceMonitoringService/DeleteService", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1492,8 +1492,8 @@ func (c *serviceMonitoringServiceClient) UpdateServiceLevelObjective(ctx context
 	return out, nil
 }
 
-func (c *serviceMonitoringServiceClient) DeleteServiceLevelObjective(ctx context.Context, in *DeleteServiceLevelObjectiveRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *serviceMonitoringServiceClient) DeleteServiceLevelObjective(ctx context.Context, in *DeleteServiceLevelObjectiveRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.ServiceMonitoringService/DeleteServiceLevelObjective", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1512,7 +1512,7 @@ type ServiceMonitoringServiceServer interface {
 	// Update this `Service`.
 	UpdateService(context.Context, *UpdateServiceRequest) (*Service, error)
 	// Soft delete this `Service`.
-	DeleteService(context.Context, *DeleteServiceRequest) (*empty.Empty, error)
+	DeleteService(context.Context, *DeleteServiceRequest) (*emptypb.Empty, error)
 	// Create a `ServiceLevelObjective` for the given `Service`.
 	CreateServiceLevelObjective(context.Context, *CreateServiceLevelObjectiveRequest) (*ServiceLevelObjective, error)
 	// Get a `ServiceLevelObjective` by name.
@@ -1522,7 +1522,7 @@ type ServiceMonitoringServiceServer interface {
 	// Update the given `ServiceLevelObjective`.
 	UpdateServiceLevelObjective(context.Context, *UpdateServiceLevelObjectiveRequest) (*ServiceLevelObjective, error)
 	// Delete the given `ServiceLevelObjective`.
-	DeleteServiceLevelObjective(context.Context, *DeleteServiceLevelObjectiveRequest) (*empty.Empty, error)
+	DeleteServiceLevelObjective(context.Context, *DeleteServiceLevelObjectiveRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedServiceMonitoringServiceServer can be embedded to have forward compatible implementations.
@@ -1541,7 +1541,7 @@ func (*UnimplementedServiceMonitoringServiceServer) ListServices(context.Context
 func (*UnimplementedServiceMonitoringServiceServer) UpdateService(context.Context, *UpdateServiceRequest) (*Service, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateService not implemented")
 }
-func (*UnimplementedServiceMonitoringServiceServer) DeleteService(context.Context, *DeleteServiceRequest) (*empty.Empty, error) {
+func (*UnimplementedServiceMonitoringServiceServer) DeleteService(context.Context, *DeleteServiceRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteService not implemented")
 }
 func (*UnimplementedServiceMonitoringServiceServer) CreateServiceLevelObjective(context.Context, *CreateServiceLevelObjectiveRequest) (*ServiceLevelObjective, error) {
@@ -1556,7 +1556,7 @@ func (*UnimplementedServiceMonitoringServiceServer) ListServiceLevelObjectives(c
 func (*UnimplementedServiceMonitoringServiceServer) UpdateServiceLevelObjective(context.Context, *UpdateServiceLevelObjectiveRequest) (*ServiceLevelObjective, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateServiceLevelObjective not implemented")
 }
-func (*UnimplementedServiceMonitoringServiceServer) DeleteServiceLevelObjective(context.Context, *DeleteServiceLevelObjectiveRequest) (*empty.Empty, error) {
+func (*UnimplementedServiceMonitoringServiceServer) DeleteServiceLevelObjective(context.Context, *DeleteServiceLevelObjectiveRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteServiceLevelObjective not implemented")
 }
 
diff --git a/monitoring/apiv3/v2/monitoringpb/span_context.pb.go b/monitoring/apiv3/v2/monitoringpb/span_context.pb.go
index 905b4579bae..cf2bc553642 100644
--- a/monitoring/apiv3/v2/monitoringpb/span_context.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/span_context.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/span_context.proto
 
 package monitoringpb
diff --git a/monitoring/apiv3/v2/monitoringpb/uptime.pb.go b/monitoring/apiv3/v2/monitoringpb/uptime.pb.go
index 0952a5f4eab..03b27696317 100644
--- a/monitoring/apiv3/v2/monitoringpb/uptime.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/uptime.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/uptime.proto
 
 package monitoringpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -545,10 +545,10 @@ type UptimeCheckConfig struct {
 	// Currently, the only supported values are `60s` (1 minute), `300s`
 	// (5 minutes), `600s` (10 minutes), and `900s` (15 minutes). Optional,
 	// defaults to `60s`.
-	Period *duration.Duration `protobuf:"bytes,7,opt,name=period,proto3" json:"period,omitempty"`
+	Period *durationpb.Duration `protobuf:"bytes,7,opt,name=period,proto3" json:"period,omitempty"`
 	// The maximum amount of time to wait for the request to complete (must be
 	// between 1 and 60 seconds). Required.
-	Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// The content that is expected to appear in the data returned by the target
 	// server against which the check is run.  Currently, only the first entry
 	// in the `content_matchers` list is supported, and additional entries will
@@ -665,14 +665,14 @@ func (x *UptimeCheckConfig) GetTcpCheck() *UptimeCheckConfig_TcpCheck {
 	return nil
 }
 
-func (x *UptimeCheckConfig) GetPeriod() *duration.Duration {
+func (x *UptimeCheckConfig) GetPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.Period
 	}
 	return nil
 }
 
-func (x *UptimeCheckConfig) GetTimeout() *duration.Duration {
+func (x *UptimeCheckConfig) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -1481,7 +1481,7 @@ var file_google_monitoring_v3_uptime_proto_goTypes = []interface{}{
 	(*UptimeCheckConfig_HttpCheck_BasicAuthentication)(nil),    // 13: google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication
 	nil,                                    // 14: google.monitoring.v3.UptimeCheckConfig.HttpCheck.HeadersEntry
 	(*monitoredres.MonitoredResource)(nil), // 15: google.api.MonitoredResource
-	(*duration.Duration)(nil),              // 16: google.protobuf.Duration
+	(*durationpb.Duration)(nil),            // 16: google.protobuf.Duration
 }
 var file_google_monitoring_v3_uptime_proto_depIdxs = []int32{
 	2,  // 0: google.monitoring.v3.InternalChecker.state:type_name -> google.monitoring.v3.InternalChecker.State
diff --git a/monitoring/apiv3/v2/monitoringpb/uptime_service.pb.go b/monitoring/apiv3/v2/monitoringpb/uptime_service.pb.go
index a0d2d355ede..f56305af535 100644
--- a/monitoring/apiv3/v2/monitoringpb/uptime_service.pb.go
+++ b/monitoring/apiv3/v2/monitoringpb/uptime_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/v3/uptime_service.proto
 
 package monitoringpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -313,7 +313,7 @@ type UpdateUptimeCheckConfigRequest struct {
 	// configuration are updated with values from the new configuration. If this
 	// field is empty, then the current configuration is completely replaced with
 	// the new configuration.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. If an `updateMask` has been specified, this field gives
 	// the values for the set of fields mentioned in the `updateMask`. If an
 	// `updateMask` has not been given, this Uptime check configuration replaces
@@ -360,7 +360,7 @@ func (*UpdateUptimeCheckConfigRequest) Descriptor() ([]byte, []int) {
 	return file_google_monitoring_v3_uptime_service_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *UpdateUptimeCheckConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateUptimeCheckConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -773,9 +773,9 @@ var file_google_monitoring_v3_uptime_service_proto_goTypes = []interface{}{
 	(*ListUptimeCheckIpsRequest)(nil),      // 6: google.monitoring.v3.ListUptimeCheckIpsRequest
 	(*ListUptimeCheckIpsResponse)(nil),     // 7: google.monitoring.v3.ListUptimeCheckIpsResponse
 	(*UptimeCheckConfig)(nil),              // 8: google.monitoring.v3.UptimeCheckConfig
-	(*field_mask.FieldMask)(nil),           // 9: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),          // 9: google.protobuf.FieldMask
 	(*UptimeCheckIp)(nil),                  // 10: google.monitoring.v3.UptimeCheckIp
-	(*empty.Empty)(nil),                    // 11: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                  // 11: google.protobuf.Empty
 }
 var file_google_monitoring_v3_uptime_service_proto_depIdxs = []int32{
 	8,  // 0: google.monitoring.v3.ListUptimeCheckConfigsResponse.uptime_check_configs:type_name -> google.monitoring.v3.UptimeCheckConfig
@@ -953,7 +953,7 @@ type UptimeCheckServiceClient interface {
 	// Deletes an Uptime check configuration. Note that this method will fail
 	// if the Uptime check configuration is referenced by an alert policy or
 	// other dependent configs that would be rendered invalid by the deletion.
-	DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Returns the list of IP addresses that checkers run from
 	ListUptimeCheckIps(ctx context.Context, in *ListUptimeCheckIpsRequest, opts ...grpc.CallOption) (*ListUptimeCheckIpsResponse, error)
 }
@@ -1002,8 +1002,8 @@ func (c *uptimeCheckServiceClient) UpdateUptimeCheckConfig(ctx context.Context,
 	return out, nil
 }
 
-func (c *uptimeCheckServiceClient) DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *uptimeCheckServiceClient) DeleteUptimeCheckConfig(ctx context.Context, in *DeleteUptimeCheckConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.v3.UptimeCheckService/DeleteUptimeCheckConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1037,7 +1037,7 @@ type UptimeCheckServiceServer interface {
 	// Deletes an Uptime check configuration. Note that this method will fail
 	// if the Uptime check configuration is referenced by an alert policy or
 	// other dependent configs that would be rendered invalid by the deletion.
-	DeleteUptimeCheckConfig(context.Context, *DeleteUptimeCheckConfigRequest) (*empty.Empty, error)
+	DeleteUptimeCheckConfig(context.Context, *DeleteUptimeCheckConfigRequest) (*emptypb.Empty, error)
 	// Returns the list of IP addresses that checkers run from
 	ListUptimeCheckIps(context.Context, *ListUptimeCheckIpsRequest) (*ListUptimeCheckIpsResponse, error)
 }
@@ -1058,7 +1058,7 @@ func (*UnimplementedUptimeCheckServiceServer) CreateUptimeCheckConfig(context.Co
 func (*UnimplementedUptimeCheckServiceServer) UpdateUptimeCheckConfig(context.Context, *UpdateUptimeCheckConfigRequest) (*UptimeCheckConfig, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateUptimeCheckConfig not implemented")
 }
-func (*UnimplementedUptimeCheckServiceServer) DeleteUptimeCheckConfig(context.Context, *DeleteUptimeCheckConfigRequest) (*empty.Empty, error) {
+func (*UnimplementedUptimeCheckServiceServer) DeleteUptimeCheckConfig(context.Context, *DeleteUptimeCheckConfigRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteUptimeCheckConfig not implemented")
 }
 func (*UnimplementedUptimeCheckServiceServer) ListUptimeCheckIps(context.Context, *ListUptimeCheckIpsRequest) (*ListUptimeCheckIpsResponse, error) {
diff --git a/monitoring/apiv3/v2/notification_channel_client.go b/monitoring/apiv3/v2/notification_channel_client.go
index 591dd289e7d..240bdbebd58 100644
--- a/monitoring/apiv3/v2/notification_channel_client.go
+++ b/monitoring/apiv3/v2/notification_channel_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/monitoring/apiv3/v2/notification_channel_client_example_test.go b/monitoring/apiv3/v2/notification_channel_client_example_test.go
index 8d24d335250..f7865e9a92b 100644
--- a/monitoring/apiv3/v2/notification_channel_client_example_test.go
+++ b/monitoring/apiv3/v2/notification_channel_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	monitoring "cloud.google.com/go/monitoring/apiv3/v2"
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	"google.golang.org/api/iterator"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 )
 
 func ExampleNewNotificationChannelClient() {
@@ -56,7 +56,7 @@ func ExampleNotificationChannelClient_ListNotificationChannelDescriptors() {
 
 	req := &monitoringpb.ListNotificationChannelDescriptorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListNotificationChannelDescriptorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListNotificationChannelDescriptorsRequest.
 	}
 	it := c.ListNotificationChannelDescriptors(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleNotificationChannelClient_GetNotificationChannelDescriptor() {
 
 	req := &monitoringpb.GetNotificationChannelDescriptorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetNotificationChannelDescriptorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetNotificationChannelDescriptorRequest.
 	}
 	resp, err := c.GetNotificationChannelDescriptor(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleNotificationChannelClient_ListNotificationChannels() {
 
 	req := &monitoringpb.ListNotificationChannelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListNotificationChannelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListNotificationChannelsRequest.
 	}
 	it := c.ListNotificationChannels(ctx, req)
 	for {
@@ -143,7 +143,7 @@ func ExampleNotificationChannelClient_GetNotificationChannel() {
 
 	req := &monitoringpb.GetNotificationChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetNotificationChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetNotificationChannelRequest.
 	}
 	resp, err := c.GetNotificationChannel(ctx, req)
 	if err != nil {
@@ -168,7 +168,7 @@ func ExampleNotificationChannelClient_CreateNotificationChannel() {
 
 	req := &monitoringpb.CreateNotificationChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateNotificationChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateNotificationChannelRequest.
 	}
 	resp, err := c.CreateNotificationChannel(ctx, req)
 	if err != nil {
@@ -193,7 +193,7 @@ func ExampleNotificationChannelClient_UpdateNotificationChannel() {
 
 	req := &monitoringpb.UpdateNotificationChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#UpdateNotificationChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#UpdateNotificationChannelRequest.
 	}
 	resp, err := c.UpdateNotificationChannel(ctx, req)
 	if err != nil {
@@ -218,7 +218,7 @@ func ExampleNotificationChannelClient_DeleteNotificationChannel() {
 
 	req := &monitoringpb.DeleteNotificationChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#DeleteNotificationChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#DeleteNotificationChannelRequest.
 	}
 	err = c.DeleteNotificationChannel(ctx, req)
 	if err != nil {
@@ -241,7 +241,7 @@ func ExampleNotificationChannelClient_SendNotificationChannelVerificationCode()
 
 	req := &monitoringpb.SendNotificationChannelVerificationCodeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#SendNotificationChannelVerificationCodeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#SendNotificationChannelVerificationCodeRequest.
 	}
 	err = c.SendNotificationChannelVerificationCode(ctx, req)
 	if err != nil {
@@ -264,7 +264,7 @@ func ExampleNotificationChannelClient_GetNotificationChannelVerificationCode() {
 
 	req := &monitoringpb.GetNotificationChannelVerificationCodeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetNotificationChannelVerificationCodeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetNotificationChannelVerificationCodeRequest.
 	}
 	resp, err := c.GetNotificationChannelVerificationCode(ctx, req)
 	if err != nil {
@@ -289,7 +289,7 @@ func ExampleNotificationChannelClient_VerifyNotificationChannel() {
 
 	req := &monitoringpb.VerifyNotificationChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#VerifyNotificationChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#VerifyNotificationChannelRequest.
 	}
 	resp, err := c.VerifyNotificationChannel(ctx, req)
 	if err != nil {
diff --git a/monitoring/apiv3/v2/query_client.go b/monitoring/apiv3/v2/query_client.go
index f3a85c9a660..0d7af17a0a0 100644
--- a/monitoring/apiv3/v2/query_client.go
+++ b/monitoring/apiv3/v2/query_client.go
@@ -22,12 +22,12 @@ import (
 	"math"
 	"net/url"
 
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/monitoring/apiv3/v2/query_client_example_test.go b/monitoring/apiv3/v2/query_client_example_test.go
index 5d996a6cd04..d4333e8e0bb 100644
--- a/monitoring/apiv3/v2/query_client_example_test.go
+++ b/monitoring/apiv3/v2/query_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	monitoring "cloud.google.com/go/monitoring/apiv3/v2"
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	"google.golang.org/api/iterator"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 )
 
 func ExampleNewQueryClient() {
@@ -56,7 +56,7 @@ func ExampleQueryClient_QueryTimeSeries() {
 
 	req := &monitoringpb.QueryTimeSeriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#QueryTimeSeriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#QueryTimeSeriesRequest.
 	}
 	it := c.QueryTimeSeries(ctx, req)
 	for {
diff --git a/monitoring/apiv3/v2/service_monitoring_client.go b/monitoring/apiv3/v2/service_monitoring_client.go
index 56f8b4d0600..3b5b471cf7e 100644
--- a/monitoring/apiv3/v2/service_monitoring_client.go
+++ b/monitoring/apiv3/v2/service_monitoring_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/monitoring/apiv3/v2/service_monitoring_client_example_test.go b/monitoring/apiv3/v2/service_monitoring_client_example_test.go
index c460d4ab7b6..c879c692a2e 100644
--- a/monitoring/apiv3/v2/service_monitoring_client_example_test.go
+++ b/monitoring/apiv3/v2/service_monitoring_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	monitoring "cloud.google.com/go/monitoring/apiv3/v2"
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	"google.golang.org/api/iterator"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 )
 
 func ExampleNewServiceMonitoringClient() {
@@ -56,7 +56,7 @@ func ExampleServiceMonitoringClient_CreateService() {
 
 	req := &monitoringpb.CreateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateServiceRequest.
 	}
 	resp, err := c.CreateService(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleServiceMonitoringClient_GetService() {
 
 	req := &monitoringpb.GetServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetServiceRequest.
 	}
 	resp, err := c.GetService(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleServiceMonitoringClient_ListServices() {
 
 	req := &monitoringpb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
@@ -137,7 +137,7 @@ func ExampleServiceMonitoringClient_UpdateService() {
 
 	req := &monitoringpb.UpdateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#UpdateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#UpdateServiceRequest.
 	}
 	resp, err := c.UpdateService(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleServiceMonitoringClient_DeleteService() {
 
 	req := &monitoringpb.DeleteServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#DeleteServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#DeleteServiceRequest.
 	}
 	err = c.DeleteService(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleServiceMonitoringClient_CreateServiceLevelObjective() {
 
 	req := &monitoringpb.CreateServiceLevelObjectiveRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateServiceLevelObjectiveRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateServiceLevelObjectiveRequest.
 	}
 	resp, err := c.CreateServiceLevelObjective(ctx, req)
 	if err != nil {
@@ -210,7 +210,7 @@ func ExampleServiceMonitoringClient_GetServiceLevelObjective() {
 
 	req := &monitoringpb.GetServiceLevelObjectiveRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetServiceLevelObjectiveRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetServiceLevelObjectiveRequest.
 	}
 	resp, err := c.GetServiceLevelObjective(ctx, req)
 	if err != nil {
@@ -235,7 +235,7 @@ func ExampleServiceMonitoringClient_ListServiceLevelObjectives() {
 
 	req := &monitoringpb.ListServiceLevelObjectivesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListServiceLevelObjectivesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListServiceLevelObjectivesRequest.
 	}
 	it := c.ListServiceLevelObjectives(ctx, req)
 	for {
@@ -266,7 +266,7 @@ func ExampleServiceMonitoringClient_UpdateServiceLevelObjective() {
 
 	req := &monitoringpb.UpdateServiceLevelObjectiveRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#UpdateServiceLevelObjectiveRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#UpdateServiceLevelObjectiveRequest.
 	}
 	resp, err := c.UpdateServiceLevelObjective(ctx, req)
 	if err != nil {
@@ -291,7 +291,7 @@ func ExampleServiceMonitoringClient_DeleteServiceLevelObjective() {
 
 	req := &monitoringpb.DeleteServiceLevelObjectiveRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#DeleteServiceLevelObjectiveRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#DeleteServiceLevelObjectiveRequest.
 	}
 	err = c.DeleteServiceLevelObjective(ctx, req)
 	if err != nil {
diff --git a/monitoring/apiv3/v2/uptime_check_client.go b/monitoring/apiv3/v2/uptime_check_client.go
index 9171f3037c9..b0da1501c76 100644
--- a/monitoring/apiv3/v2/uptime_check_client.go
+++ b/monitoring/apiv3/v2/uptime_check_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/monitoring/apiv3/v2/uptime_check_client_example_test.go b/monitoring/apiv3/v2/uptime_check_client_example_test.go
index ad5055cbb1a..1be5618e0d1 100644
--- a/monitoring/apiv3/v2/uptime_check_client_example_test.go
+++ b/monitoring/apiv3/v2/uptime_check_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	monitoring "cloud.google.com/go/monitoring/apiv3/v2"
+	monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	"google.golang.org/api/iterator"
-	monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3"
 )
 
 func ExampleNewUptimeCheckClient() {
@@ -56,7 +56,7 @@ func ExampleUptimeCheckClient_ListUptimeCheckConfigs() {
 
 	req := &monitoringpb.ListUptimeCheckConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListUptimeCheckConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListUptimeCheckConfigsRequest.
 	}
 	it := c.ListUptimeCheckConfigs(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleUptimeCheckClient_GetUptimeCheckConfig() {
 
 	req := &monitoringpb.GetUptimeCheckConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#GetUptimeCheckConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#GetUptimeCheckConfigRequest.
 	}
 	resp, err := c.GetUptimeCheckConfig(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleUptimeCheckClient_CreateUptimeCheckConfig() {
 
 	req := &monitoringpb.CreateUptimeCheckConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#CreateUptimeCheckConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#CreateUptimeCheckConfigRequest.
 	}
 	resp, err := c.CreateUptimeCheckConfig(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleUptimeCheckClient_UpdateUptimeCheckConfig() {
 
 	req := &monitoringpb.UpdateUptimeCheckConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#UpdateUptimeCheckConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#UpdateUptimeCheckConfigRequest.
 	}
 	resp, err := c.UpdateUptimeCheckConfig(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleUptimeCheckClient_DeleteUptimeCheckConfig() {
 
 	req := &monitoringpb.DeleteUptimeCheckConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#DeleteUptimeCheckConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#DeleteUptimeCheckConfigRequest.
 	}
 	err = c.DeleteUptimeCheckConfig(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleUptimeCheckClient_ListUptimeCheckIps() {
 
 	req := &monitoringpb.ListUptimeCheckIpsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/v3#ListUptimeCheckIpsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb#ListUptimeCheckIpsRequest.
 	}
 	it := c.ListUptimeCheckIps(ctx, req)
 	for {
diff --git a/monitoring/dashboard/apiv1/dashboardpb/alertchart.pb.go b/monitoring/dashboard/apiv1/dashboardpb/alertchart.pb.go
index cf1f62574b4..6d79333ae4a 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/alertchart.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/alertchart.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/alertchart.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/collapsible_group.pb.go b/monitoring/dashboard/apiv1/dashboardpb/collapsible_group.pb.go
index b7cb5f63ef7..e4568cb484b 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/collapsible_group.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/collapsible_group.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/collapsible_group.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/common.pb.go b/monitoring/dashboard/apiv1/dashboardpb/common.pb.go
index 977d9d19b81..67640af5661 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/common.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/common.proto
 
 package dashboardpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -611,7 +611,7 @@ type Aggregation struct {
 	// specified, then this field is ignored.
 	//
 	// The maximum value of the `alignment_period` is 2 years, or 104 weeks.
-	AlignmentPeriod *duration.Duration `protobuf:"bytes,1,opt,name=alignment_period,json=alignmentPeriod,proto3" json:"alignment_period,omitempty"`
+	AlignmentPeriod *durationpb.Duration `protobuf:"bytes,1,opt,name=alignment_period,json=alignmentPeriod,proto3" json:"alignment_period,omitempty"`
 	// An `Aligner` describes how to bring the data points in a single
 	// time series into temporal alignment. Except for `ALIGN_NONE`, all
 	// alignments cause all the data points in an `alignment_period` to be
@@ -693,7 +693,7 @@ func (*Aggregation) Descriptor() ([]byte, []int) {
 	return file_google_monitoring_dashboard_v1_common_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *Aggregation) GetAlignmentPeriod() *duration.Duration {
+func (x *Aggregation) GetAlignmentPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.AlignmentPeriod
 	}
@@ -1018,7 +1018,7 @@ var file_google_monitoring_dashboard_v1_common_proto_goTypes = []interface{}{
 	(*Aggregation)(nil),                     // 5: google.monitoring.dashboard.v1.Aggregation
 	(*PickTimeSeriesFilter)(nil),            // 6: google.monitoring.dashboard.v1.PickTimeSeriesFilter
 	(*StatisticalTimeSeriesFilter)(nil),     // 7: google.monitoring.dashboard.v1.StatisticalTimeSeriesFilter
-	(*duration.Duration)(nil),               // 8: google.protobuf.Duration
+	(*durationpb.Duration)(nil),             // 8: google.protobuf.Duration
 }
 var file_google_monitoring_dashboard_v1_common_proto_depIdxs = []int32{
 	8, // 0: google.monitoring.dashboard.v1.Aggregation.alignment_period:type_name -> google.protobuf.Duration
diff --git a/monitoring/dashboard/apiv1/dashboardpb/dashboard.pb.go b/monitoring/dashboard/apiv1/dashboardpb/dashboard.pb.go
index 18f2fb8682d..b4a86487ac5 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/dashboard.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/dashboard.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/dashboard.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/dashboard_filter.pb.go b/monitoring/dashboard/apiv1/dashboardpb/dashboard_filter.pb.go
index 37362038e8c..c77b9e19428 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/dashboard_filter.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/dashboard_filter.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/dashboard_filter.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/dashboards_service.pb.go b/monitoring/dashboard/apiv1/dashboardpb/dashboards_service.pb.go
index 67e8ae8735c..a2ce5bde2f8 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/dashboards_service.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/dashboards_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/dashboards_service.proto
 
 package dashboardpb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -586,7 +586,7 @@ var file_google_monitoring_dashboard_v1_dashboards_service_proto_goTypes = []int
 	(*DeleteDashboardRequest)(nil), // 4: google.monitoring.dashboard.v1.DeleteDashboardRequest
 	(*UpdateDashboardRequest)(nil), // 5: google.monitoring.dashboard.v1.UpdateDashboardRequest
 	(*Dashboard)(nil),              // 6: google.monitoring.dashboard.v1.Dashboard
-	(*empty.Empty)(nil),            // 7: google.protobuf.Empty
+	(*emptypb.Empty)(nil),          // 7: google.protobuf.Empty
 }
 var file_google_monitoring_dashboard_v1_dashboards_service_proto_depIdxs = []int32{
 	6, // 0: google.monitoring.dashboard.v1.CreateDashboardRequest.dashboard:type_name -> google.monitoring.dashboard.v1.Dashboard
@@ -741,7 +741,7 @@ type DashboardsServiceClient interface {
 	// This method requires the `monitoring.dashboards.delete` permission
 	// on the specified dashboard. For more information, see
 	// [Cloud Identity and Access Management](https://cloud.google.com/iam).
-	DeleteDashboard(ctx context.Context, in *DeleteDashboardRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteDashboard(ctx context.Context, in *DeleteDashboardRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Replaces an existing custom dashboard with a new definition.
 	//
 	// This method requires the `monitoring.dashboards.update` permission
@@ -785,8 +785,8 @@ func (c *dashboardsServiceClient) GetDashboard(ctx context.Context, in *GetDashb
 	return out, nil
 }
 
-func (c *dashboardsServiceClient) DeleteDashboard(ctx context.Context, in *DeleteDashboardRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *dashboardsServiceClient) DeleteDashboard(ctx context.Context, in *DeleteDashboardRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.monitoring.dashboard.v1.DashboardsService/DeleteDashboard", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -825,7 +825,7 @@ type DashboardsServiceServer interface {
 	// This method requires the `monitoring.dashboards.delete` permission
 	// on the specified dashboard. For more information, see
 	// [Cloud Identity and Access Management](https://cloud.google.com/iam).
-	DeleteDashboard(context.Context, *DeleteDashboardRequest) (*empty.Empty, error)
+	DeleteDashboard(context.Context, *DeleteDashboardRequest) (*emptypb.Empty, error)
 	// Replaces an existing custom dashboard with a new definition.
 	//
 	// This method requires the `monitoring.dashboards.update` permission
@@ -847,7 +847,7 @@ func (*UnimplementedDashboardsServiceServer) ListDashboards(context.Context, *Li
 func (*UnimplementedDashboardsServiceServer) GetDashboard(context.Context, *GetDashboardRequest) (*Dashboard, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetDashboard not implemented")
 }
-func (*UnimplementedDashboardsServiceServer) DeleteDashboard(context.Context, *DeleteDashboardRequest) (*empty.Empty, error) {
+func (*UnimplementedDashboardsServiceServer) DeleteDashboard(context.Context, *DeleteDashboardRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteDashboard not implemented")
 }
 func (*UnimplementedDashboardsServiceServer) UpdateDashboard(context.Context, *UpdateDashboardRequest) (*Dashboard, error) {
diff --git a/monitoring/dashboard/apiv1/dashboardpb/drilldowns.pb.go b/monitoring/dashboard/apiv1/dashboardpb/drilldowns.pb.go
index 08524e18c10..4371246da87 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/drilldowns.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/drilldowns.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/drilldowns.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/layouts.pb.go b/monitoring/dashboard/apiv1/dashboardpb/layouts.pb.go
index f95d77fe4a5..3fc53f64d6a 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/layouts.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/layouts.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/layouts.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/logs_panel.pb.go b/monitoring/dashboard/apiv1/dashboardpb/logs_panel.pb.go
index cc4608a2120..85f1e57520d 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/logs_panel.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/logs_panel.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/logs_panel.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/metrics.pb.go b/monitoring/dashboard/apiv1/dashboardpb/metrics.pb.go
index 1c22c967cc3..6b35f028f89 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/metrics.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/metrics.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/metrics.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/scorecard.pb.go b/monitoring/dashboard/apiv1/dashboardpb/scorecard.pb.go
index ca05a8c5f7a..26a91b84c6b 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/scorecard.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/scorecard.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/scorecard.proto
 
 package dashboardpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -260,7 +260,7 @@ type Scorecard_SparkChartView struct {
 	// For example, if the data is published once every 10 minutes it would not
 	// make sense to fetch and align data at one minute intervals. This field is
 	// optional and exists only as a hint.
-	MinAlignmentPeriod *duration.Duration `protobuf:"bytes,2,opt,name=min_alignment_period,json=minAlignmentPeriod,proto3" json:"min_alignment_period,omitempty"`
+	MinAlignmentPeriod *durationpb.Duration `protobuf:"bytes,2,opt,name=min_alignment_period,json=minAlignmentPeriod,proto3" json:"min_alignment_period,omitempty"`
 }
 
 func (x *Scorecard_SparkChartView) Reset() {
@@ -302,7 +302,7 @@ func (x *Scorecard_SparkChartView) GetSparkChartType() SparkChartType {
 	return SparkChartType_SPARK_CHART_TYPE_UNSPECIFIED
 }
 
-func (x *Scorecard_SparkChartView) GetMinAlignmentPeriod() *duration.Duration {
+func (x *Scorecard_SparkChartView) GetMinAlignmentPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.MinAlignmentPeriod
 	}
@@ -404,7 +404,7 @@ var file_google_monitoring_dashboard_v1_scorecard_proto_goTypes = []interface{}{
 	(*TimeSeriesQuery)(nil),          // 3: google.monitoring.dashboard.v1.TimeSeriesQuery
 	(*Threshold)(nil),                // 4: google.monitoring.dashboard.v1.Threshold
 	(SparkChartType)(0),              // 5: google.monitoring.dashboard.v1.SparkChartType
-	(*duration.Duration)(nil),        // 6: google.protobuf.Duration
+	(*durationpb.Duration)(nil),      // 6: google.protobuf.Duration
 }
 var file_google_monitoring_dashboard_v1_scorecard_proto_depIdxs = []int32{
 	3, // 0: google.monitoring.dashboard.v1.Scorecard.time_series_query:type_name -> google.monitoring.dashboard.v1.TimeSeriesQuery
diff --git a/monitoring/dashboard/apiv1/dashboardpb/service.pb.go b/monitoring/dashboard/apiv1/dashboardpb/service.pb.go
index 18aab2e9b5b..7902da1cb7e 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/service.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/service.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/table.pb.go b/monitoring/dashboard/apiv1/dashboardpb/table.pb.go
index 348f2e38c95..6cad36ff305 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/table.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/table.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/table.proto
 
 package dashboardpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -105,7 +105,7 @@ type TimeSeriesTable_TableDataSet struct {
 	// For example, if the data is published once every 10 minutes, the
 	// `min_alignment_period` should be at least 10 minutes. It would not
 	// make sense to fetch and align data at one minute intervals.
-	MinAlignmentPeriod *duration.Duration `protobuf:"bytes,3,opt,name=min_alignment_period,json=minAlignmentPeriod,proto3" json:"min_alignment_period,omitempty"`
+	MinAlignmentPeriod *durationpb.Duration `protobuf:"bytes,3,opt,name=min_alignment_period,json=minAlignmentPeriod,proto3" json:"min_alignment_period,omitempty"`
 	// Optional. Table display options for configuring how the table is rendered.
 	TableDisplayOptions *TableDisplayOptions `protobuf:"bytes,4,opt,name=table_display_options,json=tableDisplayOptions,proto3" json:"table_display_options,omitempty"`
 }
@@ -156,7 +156,7 @@ func (x *TimeSeriesTable_TableDataSet) GetTableTemplate() string {
 	return ""
 }
 
-func (x *TimeSeriesTable_TableDataSet) GetMinAlignmentPeriod() *duration.Duration {
+func (x *TimeSeriesTable_TableDataSet) GetMinAlignmentPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.MinAlignmentPeriod
 	}
@@ -253,7 +253,7 @@ var file_google_monitoring_dashboard_v1_table_proto_goTypes = []interface{}{
 	(*TimeSeriesTable)(nil),              // 0: google.monitoring.dashboard.v1.TimeSeriesTable
 	(*TimeSeriesTable_TableDataSet)(nil), // 1: google.monitoring.dashboard.v1.TimeSeriesTable.TableDataSet
 	(*TimeSeriesQuery)(nil),              // 2: google.monitoring.dashboard.v1.TimeSeriesQuery
-	(*duration.Duration)(nil),            // 3: google.protobuf.Duration
+	(*durationpb.Duration)(nil),          // 3: google.protobuf.Duration
 	(*TableDisplayOptions)(nil),          // 4: google.monitoring.dashboard.v1.TableDisplayOptions
 }
 var file_google_monitoring_dashboard_v1_table_proto_depIdxs = []int32{
diff --git a/monitoring/dashboard/apiv1/dashboardpb/table_display_options.pb.go b/monitoring/dashboard/apiv1/dashboardpb/table_display_options.pb.go
index 1808d29446f..92721e6cce7 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/table_display_options.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/table_display_options.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/table_display_options.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/text.pb.go b/monitoring/dashboard/apiv1/dashboardpb/text.pb.go
index e6cfdd96c27..e3d38d213ae 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/text.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/text.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/text.proto
 
 package dashboardpb
diff --git a/monitoring/dashboard/apiv1/dashboardpb/widget.pb.go b/monitoring/dashboard/apiv1/dashboardpb/widget.pb.go
index f9cb56c9555..741e0e1d10e 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/widget.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/widget.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/widget.proto
 
 package dashboardpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -128,7 +128,7 @@ func (x *Widget) GetText() *Text {
 	return nil
 }
 
-func (x *Widget) GetBlank() *empty.Empty {
+func (x *Widget) GetBlank() *emptypb.Empty {
 	if x, ok := x.GetContent().(*Widget_Blank); ok {
 		return x.Blank
 	}
@@ -184,7 +184,7 @@ type Widget_Text struct {
 
 type Widget_Blank struct {
 	// A blank space.
-	Blank *empty.Empty `protobuf:"bytes,5,opt,name=blank,proto3,oneof"`
+	Blank *emptypb.Empty `protobuf:"bytes,5,opt,name=blank,proto3,oneof"`
 }
 
 type Widget_AlertChart struct {
@@ -334,7 +334,7 @@ var file_google_monitoring_dashboard_v1_widget_proto_goTypes = []interface{}{
 	(*XyChart)(nil),          // 1: google.monitoring.dashboard.v1.XyChart
 	(*Scorecard)(nil),        // 2: google.monitoring.dashboard.v1.Scorecard
 	(*Text)(nil),             // 3: google.monitoring.dashboard.v1.Text
-	(*empty.Empty)(nil),      // 4: google.protobuf.Empty
+	(*emptypb.Empty)(nil),    // 4: google.protobuf.Empty
 	(*AlertChart)(nil),       // 5: google.monitoring.dashboard.v1.AlertChart
 	(*TimeSeriesTable)(nil),  // 6: google.monitoring.dashboard.v1.TimeSeriesTable
 	(*CollapsibleGroup)(nil), // 7: google.monitoring.dashboard.v1.CollapsibleGroup
diff --git a/monitoring/dashboard/apiv1/dashboardpb/xychart.pb.go b/monitoring/dashboard/apiv1/dashboardpb/xychart.pb.go
index 3bf286e0e45..64116618875 100644
--- a/monitoring/dashboard/apiv1/dashboardpb/xychart.pb.go
+++ b/monitoring/dashboard/apiv1/dashboardpb/xychart.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/dashboard/v1/xychart.proto
 
 package dashboardpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -286,7 +286,7 @@ type XyChart struct {
 	// (e.g., week-over-week metrics).
 	// The duration must be positive, and it can only be applied to charts with
 	// data sets of LINE plot type.
-	TimeshiftDuration *duration.Duration `protobuf:"bytes,4,opt,name=timeshift_duration,json=timeshiftDuration,proto3" json:"timeshift_duration,omitempty"`
+	TimeshiftDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=timeshift_duration,json=timeshiftDuration,proto3" json:"timeshift_duration,omitempty"`
 	// Threshold lines drawn horizontally across the chart.
 	Thresholds []*Threshold `protobuf:"bytes,5,rep,name=thresholds,proto3" json:"thresholds,omitempty"`
 	// The properties applied to the X axis.
@@ -338,7 +338,7 @@ func (x *XyChart) GetDataSets() []*XyChart_DataSet {
 	return nil
 }
 
-func (x *XyChart) GetTimeshiftDuration() *duration.Duration {
+func (x *XyChart) GetTimeshiftDuration() *durationpb.Duration {
 	if x != nil {
 		return x.TimeshiftDuration
 	}
@@ -449,7 +449,7 @@ type XyChart_DataSet struct {
 	// For example, if the data is published once every 10 minutes, the
 	// `min_alignment_period` should be at least 10 minutes. It would not
 	// make sense to fetch and align data at one minute intervals.
-	MinAlignmentPeriod *duration.Duration `protobuf:"bytes,4,opt,name=min_alignment_period,json=minAlignmentPeriod,proto3" json:"min_alignment_period,omitempty"`
+	MinAlignmentPeriod *durationpb.Duration `protobuf:"bytes,4,opt,name=min_alignment_period,json=minAlignmentPeriod,proto3" json:"min_alignment_period,omitempty"`
 	// Optional. The target axis to use for plotting the metric.
 	TargetAxis XyChart_DataSet_TargetAxis `protobuf:"varint,5,opt,name=target_axis,json=targetAxis,proto3,enum=google.monitoring.dashboard.v1.XyChart_DataSet_TargetAxis" json:"target_axis,omitempty"`
 }
@@ -507,7 +507,7 @@ func (x *XyChart_DataSet) GetLegendTemplate() string {
 	return ""
 }
 
-func (x *XyChart_DataSet) GetMinAlignmentPeriod() *duration.Duration {
+func (x *XyChart_DataSet) GetMinAlignmentPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.MinAlignmentPeriod
 	}
@@ -724,7 +724,7 @@ var file_google_monitoring_dashboard_v1_xychart_proto_goTypes = []interface{}{
 	(*ChartOptions)(nil),            // 5: google.monitoring.dashboard.v1.ChartOptions
 	(*XyChart_DataSet)(nil),         // 6: google.monitoring.dashboard.v1.XyChart.DataSet
 	(*XyChart_Axis)(nil),            // 7: google.monitoring.dashboard.v1.XyChart.Axis
-	(*duration.Duration)(nil),       // 8: google.protobuf.Duration
+	(*durationpb.Duration)(nil),     // 8: google.protobuf.Duration
 	(*Threshold)(nil),               // 9: google.monitoring.dashboard.v1.Threshold
 	(*TimeSeriesQuery)(nil),         // 10: google.monitoring.dashboard.v1.TimeSeriesQuery
 }
diff --git a/monitoring/dashboard/apiv1/dashboards_client.go b/monitoring/dashboard/apiv1/dashboards_client.go
index 87236d18e93..0bcc6cdc901 100644
--- a/monitoring/dashboard/apiv1/dashboards_client.go
+++ b/monitoring/dashboard/apiv1/dashboards_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	dashboardpb "cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	dashboardpb "google.golang.org/genproto/googleapis/monitoring/dashboard/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/monitoring/dashboard/apiv1/dashboards_client_example_test.go b/monitoring/dashboard/apiv1/dashboards_client_example_test.go
index 45901e6fd20..fd21379b062 100644
--- a/monitoring/dashboard/apiv1/dashboards_client_example_test.go
+++ b/monitoring/dashboard/apiv1/dashboards_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	dashboard "cloud.google.com/go/monitoring/dashboard/apiv1"
+	dashboardpb "cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb"
 	"google.golang.org/api/iterator"
-	dashboardpb "google.golang.org/genproto/googleapis/monitoring/dashboard/v1"
 )
 
 func ExampleNewDashboardsClient() {
@@ -56,7 +56,7 @@ func ExampleDashboardsClient_CreateDashboard() {
 
 	req := &dashboardpb.CreateDashboardRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/dashboard/v1#CreateDashboardRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb#CreateDashboardRequest.
 	}
 	resp, err := c.CreateDashboard(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleDashboardsClient_ListDashboards() {
 
 	req := &dashboardpb.ListDashboardsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/dashboard/v1#ListDashboardsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb#ListDashboardsRequest.
 	}
 	it := c.ListDashboards(ctx, req)
 	for {
@@ -112,7 +112,7 @@ func ExampleDashboardsClient_GetDashboard() {
 
 	req := &dashboardpb.GetDashboardRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/dashboard/v1#GetDashboardRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb#GetDashboardRequest.
 	}
 	resp, err := c.GetDashboard(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleDashboardsClient_DeleteDashboard() {
 
 	req := &dashboardpb.DeleteDashboardRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/dashboard/v1#DeleteDashboardRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb#DeleteDashboardRequest.
 	}
 	err = c.DeleteDashboard(ctx, req)
 	if err != nil {
@@ -160,7 +160,7 @@ func ExampleDashboardsClient_UpdateDashboard() {
 
 	req := &dashboardpb.UpdateDashboardRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/dashboard/v1#UpdateDashboardRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb#UpdateDashboardRequest.
 	}
 	resp, err := c.UpdateDashboard(ctx, req)
 	if err != nil {
diff --git a/monitoring/dashboard/apiv1/doc.go b/monitoring/dashboard/apiv1/doc.go
index 03522aad3e6..3c41bed64b8 100644
--- a/monitoring/dashboard/apiv1/doc.go
+++ b/monitoring/dashboard/apiv1/doc.go
@@ -62,7 +62,7 @@
 //
 //	req := &dashboardpb.CreateDashboardRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/dashboard/v1#CreateDashboardRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/monitoring/dashboard/apiv1/dashboardpb#CreateDashboardRequest.
 //	}
 //	resp, err := c.CreateDashboard(ctx, req)
 //	if err != nil {
diff --git a/monitoring/go.mod b/monitoring/go.mod
index c654ccaed8c..9aee1efa3ee 100644
--- a/monitoring/go.mod
+++ b/monitoring/go.mod
@@ -3,11 +3,12 @@ module cloud.google.com/go/monitoring
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go v0.105.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -18,9 +19,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/monitoring/go.sum b/monitoring/go.sum
index 8784b2a0c77..a7c57802950 100644
--- a/monitoring/go.sum
+++ b/monitoring/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -39,6 +41,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -62,11 +65,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +82,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +99,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/monitoring/metricsscope/apiv1/doc.go b/monitoring/metricsscope/apiv1/doc.go
index 23ebd8d7e7c..ae0a7d803a6 100644
--- a/monitoring/metricsscope/apiv1/doc.go
+++ b/monitoring/metricsscope/apiv1/doc.go
@@ -62,7 +62,7 @@
 //
 //	req := &metricsscopepb.GetMetricsScopeRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/metricsscope/v1#GetMetricsScopeRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/monitoring/metricsscope/apiv1/metricsscopepb#GetMetricsScopeRequest.
 //	}
 //	resp, err := c.GetMetricsScope(ctx, req)
 //	if err != nil {
diff --git a/monitoring/metricsscope/apiv1/metrics_scopes_client.go b/monitoring/metricsscope/apiv1/metrics_scopes_client.go
index 7eb27018c92..73a5b0702ac 100644
--- a/monitoring/metricsscope/apiv1/metrics_scopes_client.go
+++ b/monitoring/metricsscope/apiv1/metrics_scopes_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	metricsscopepb "cloud.google.com/go/monitoring/metricsscope/apiv1/metricsscopepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-	metricsscopepb "google.golang.org/genproto/googleapis/monitoring/metricsscope/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/monitoring/metricsscope/apiv1/metrics_scopes_client_example_test.go b/monitoring/metricsscope/apiv1/metrics_scopes_client_example_test.go
index adc70612c8d..cc86312973a 100644
--- a/monitoring/metricsscope/apiv1/metrics_scopes_client_example_test.go
+++ b/monitoring/metricsscope/apiv1/metrics_scopes_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	metricsscope "cloud.google.com/go/monitoring/metricsscope/apiv1"
-	metricsscopepb "google.golang.org/genproto/googleapis/monitoring/metricsscope/v1"
+	metricsscopepb "cloud.google.com/go/monitoring/metricsscope/apiv1/metricsscopepb"
 )
 
 func ExampleNewMetricsScopesClient() {
@@ -55,7 +55,7 @@ func ExampleMetricsScopesClient_GetMetricsScope() {
 
 	req := &metricsscopepb.GetMetricsScopeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/metricsscope/v1#GetMetricsScopeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/metricsscope/apiv1/metricsscopepb#GetMetricsScopeRequest.
 	}
 	resp, err := c.GetMetricsScope(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleMetricsScopesClient_ListMetricsScopesByMonitoredProject() {
 
 	req := &metricsscopepb.ListMetricsScopesByMonitoredProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/metricsscope/v1#ListMetricsScopesByMonitoredProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/metricsscope/apiv1/metricsscopepb#ListMetricsScopesByMonitoredProjectRequest.
 	}
 	resp, err := c.ListMetricsScopesByMonitoredProject(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleMetricsScopesClient_CreateMonitoredProject() {
 
 	req := &metricsscopepb.CreateMonitoredProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/metricsscope/v1#CreateMonitoredProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/metricsscope/apiv1/metricsscopepb#CreateMonitoredProjectRequest.
 	}
 	op, err := c.CreateMonitoredProject(ctx, req)
 	if err != nil {
@@ -135,7 +135,7 @@ func ExampleMetricsScopesClient_DeleteMonitoredProject() {
 
 	req := &metricsscopepb.DeleteMonitoredProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/monitoring/metricsscope/v1#DeleteMonitoredProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/monitoring/metricsscope/apiv1/metricsscopepb#DeleteMonitoredProjectRequest.
 	}
 	op, err := c.DeleteMonitoredProject(ctx, req)
 	if err != nil {
diff --git a/monitoring/metricsscope/apiv1/metricsscopepb/metrics_scope.pb.go b/monitoring/metricsscope/apiv1/metricsscopepb/metrics_scope.pb.go
index 208fe83fcbc..300ac8facfb 100644
--- a/monitoring/metricsscope/apiv1/metricsscopepb/metrics_scope.pb.go
+++ b/monitoring/metricsscope/apiv1/metricsscopepb/metrics_scope.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/metricsscope/v1/metrics_scope.proto
 
 package metricsscopepb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -54,9 +54,9 @@ type MetricsScope struct {
 	// `locations/global/metricsScopes/{SCOPING_PROJECT_ID_OR_NUMBER}`
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time when this `Metrics Scope` was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when this `Metrics Scope` record was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The list of projects monitored by this `Metrics Scope`.
 	MonitoredProjects []*MonitoredProject `protobuf:"bytes,4,rep,name=monitored_projects,json=monitoredProjects,proto3" json:"monitored_projects,omitempty"`
 }
@@ -100,14 +100,14 @@ func (x *MetricsScope) GetName() string {
 	return ""
 }
 
-func (x *MetricsScope) GetCreateTime() *timestamp.Timestamp {
+func (x *MetricsScope) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *MetricsScope) GetUpdateTime() *timestamp.Timestamp {
+func (x *MetricsScope) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -136,7 +136,7 @@ type MonitoredProject struct {
 	// `locations/global/metricsScopes/{SCOPING_PROJECT_ID_OR_NUMBER}/projects/{MONITORED_PROJECT_ID_OR_NUMBER}`
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time when this `MonitoredProject` was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *MonitoredProject) Reset() {
@@ -178,7 +178,7 @@ func (x *MonitoredProject) GetName() string {
 	return ""
 }
 
-func (x *MonitoredProject) GetCreateTime() *timestamp.Timestamp {
+func (x *MonitoredProject) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -271,9 +271,9 @@ func file_google_monitoring_metricsscope_v1_metrics_scope_proto_rawDescGZIP() []
 
 var file_google_monitoring_metricsscope_v1_metrics_scope_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_monitoring_metricsscope_v1_metrics_scope_proto_goTypes = []interface{}{
-	(*MetricsScope)(nil),        // 0: google.monitoring.metricsscope.v1.MetricsScope
-	(*MonitoredProject)(nil),    // 1: google.monitoring.metricsscope.v1.MonitoredProject
-	(*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp
+	(*MetricsScope)(nil),          // 0: google.monitoring.metricsscope.v1.MetricsScope
+	(*MonitoredProject)(nil),      // 1: google.monitoring.metricsscope.v1.MonitoredProject
+	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
 }
 var file_google_monitoring_metricsscope_v1_metrics_scope_proto_depIdxs = []int32{
 	2, // 0: google.monitoring.metricsscope.v1.MetricsScope.create_time:type_name -> google.protobuf.Timestamp
diff --git a/monitoring/metricsscope/apiv1/metricsscopepb/metrics_scopes.pb.go b/monitoring/metricsscope/apiv1/metricsscopepb/metrics_scopes.pb.go
index f9534acb262..5243ad7f9a5 100644
--- a/monitoring/metricsscope/apiv1/metricsscopepb/metrics_scopes.pb.go
+++ b/monitoring/metricsscope/apiv1/metricsscopepb/metrics_scopes.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/monitoring/metricsscope/v1/metrics_scopes.proto
 
 package metricsscopepb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -384,9 +384,9 @@ type OperationMetadata struct {
 	// Current state of the batch operation.
 	State OperationMetadata_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.monitoring.metricsscope.v1.OperationMetadata_State" json:"state,omitempty"`
 	// The time when the batch request was received.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time when the operation result was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *OperationMetadata) Reset() {
@@ -428,14 +428,14 @@ func (x *OperationMetadata) GetState() OperationMetadata_State {
 	return OperationMetadata_STATE_UNSPECIFIED
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -647,7 +647,7 @@ var file_google_monitoring_metricsscope_v1_metrics_scopes_proto_goTypes = []inte
 	(*OperationMetadata)(nil),                           // 6: google.monitoring.metricsscope.v1.OperationMetadata
 	(*MetricsScope)(nil),                                // 7: google.monitoring.metricsscope.v1.MetricsScope
 	(*MonitoredProject)(nil),                            // 8: google.monitoring.metricsscope.v1.MonitoredProject
-	(*timestamp.Timestamp)(nil),                         // 9: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                       // 9: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),                       // 10: google.longrunning.Operation
 }
 var file_google_monitoring_metricsscope_v1_metrics_scopes_proto_depIdxs = []int32{
diff --git a/networkconnectivity/apiv1/doc.go b/networkconnectivity/apiv1/doc.go
index 1229ec3eba7..b4295b01e90 100644
--- a/networkconnectivity/apiv1/doc.go
+++ b/networkconnectivity/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &networkconnectivitypb.ListHubsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#ListHubsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#ListHubsRequest.
 //	}
 //	it := c.ListHubs(ctx, req)
 //	for {
diff --git a/networkconnectivity/apiv1/hub_client.go b/networkconnectivity/apiv1/hub_client.go
index 2f941aff458..886d2087056 100644
--- a/networkconnectivity/apiv1/hub_client.go
+++ b/networkconnectivity/apiv1/hub_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	networkconnectivitypb "cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	networkconnectivitypb "google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/networkconnectivity/apiv1/hub_client_example_test.go b/networkconnectivity/apiv1/hub_client_example_test.go
index b4a940fde9a..78e4d86f66d 100644
--- a/networkconnectivity/apiv1/hub_client_example_test.go
+++ b/networkconnectivity/apiv1/hub_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	networkconnectivity "cloud.google.com/go/networkconnectivity/apiv1"
+	networkconnectivitypb "cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb"
 	"google.golang.org/api/iterator"
-	networkconnectivitypb "google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1"
 )
 
 func ExampleNewHubClient() {
@@ -56,7 +56,7 @@ func ExampleHubClient_ListHubs() {
 
 	req := &networkconnectivitypb.ListHubsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#ListHubsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#ListHubsRequest.
 	}
 	it := c.ListHubs(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleHubClient_GetHub() {
 
 	req := &networkconnectivitypb.GetHubRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#GetHubRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#GetHubRequest.
 	}
 	resp, err := c.GetHub(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleHubClient_CreateHub() {
 
 	req := &networkconnectivitypb.CreateHubRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#CreateHubRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#CreateHubRequest.
 	}
 	op, err := c.CreateHub(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleHubClient_UpdateHub() {
 
 	req := &networkconnectivitypb.UpdateHubRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#UpdateHubRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#UpdateHubRequest.
 	}
 	op, err := c.UpdateHub(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleHubClient_DeleteHub() {
 
 	req := &networkconnectivitypb.DeleteHubRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#DeleteHubRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#DeleteHubRequest.
 	}
 	op, err := c.DeleteHub(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleHubClient_ListSpokes() {
 
 	req := &networkconnectivitypb.ListSpokesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#ListSpokesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#ListSpokesRequest.
 	}
 	it := c.ListSpokes(ctx, req)
 	for {
@@ -231,7 +231,7 @@ func ExampleHubClient_GetSpoke() {
 
 	req := &networkconnectivitypb.GetSpokeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#GetSpokeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#GetSpokeRequest.
 	}
 	resp, err := c.GetSpoke(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleHubClient_CreateSpoke() {
 
 	req := &networkconnectivitypb.CreateSpokeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#CreateSpokeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#CreateSpokeRequest.
 	}
 	op, err := c.CreateSpoke(ctx, req)
 	if err != nil {
@@ -286,7 +286,7 @@ func ExampleHubClient_UpdateSpoke() {
 
 	req := &networkconnectivitypb.UpdateSpokeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#UpdateSpokeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#UpdateSpokeRequest.
 	}
 	op, err := c.UpdateSpoke(ctx, req)
 	if err != nil {
@@ -316,7 +316,7 @@ func ExampleHubClient_DeleteSpoke() {
 
 	req := &networkconnectivitypb.DeleteSpokeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkconnectivity/v1#DeleteSpokeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkconnectivity/apiv1/networkconnectivitypb#DeleteSpokeRequest.
 	}
 	op, err := c.DeleteSpoke(ctx, req)
 	if err != nil {
diff --git a/networkconnectivity/apiv1/networkconnectivitypb/common.pb.go b/networkconnectivity/apiv1/networkconnectivitypb/common.pb.go
index 1afdfa83dc9..48ccab271d0 100644
--- a/networkconnectivity/apiv1/networkconnectivitypb/common.pb.go
+++ b/networkconnectivity/apiv1/networkconnectivitypb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/networkconnectivity/v1/common.proto
 
 package networkconnectivitypb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -44,9 +44,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -94,14 +94,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_networkconnectivity_v1_common_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -211,8 +211,8 @@ func file_google_cloud_networkconnectivity_v1_common_proto_rawDescGZIP() []byte
 
 var file_google_cloud_networkconnectivity_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_networkconnectivity_v1_common_proto_goTypes = []interface{}{
-	(*OperationMetadata)(nil),   // 0: google.cloud.networkconnectivity.v1.OperationMetadata
-	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+	(*OperationMetadata)(nil),     // 0: google.cloud.networkconnectivity.v1.OperationMetadata
+	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 }
 var file_google_cloud_networkconnectivity_v1_common_proto_depIdxs = []int32{
 	1, // 0: google.cloud.networkconnectivity.v1.OperationMetadata.create_time:type_name -> google.protobuf.Timestamp
diff --git a/networkconnectivity/apiv1/networkconnectivitypb/hub.pb.go b/networkconnectivity/apiv1/networkconnectivitypb/hub.pb.go
index d118d8556a4..72bcf1682ed 100644
--- a/networkconnectivity/apiv1/networkconnectivitypb/hub.pb.go
+++ b/networkconnectivity/apiv1/networkconnectivitypb/hub.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/networkconnectivity/v1/hub.proto
 
 package networkconnectivitypb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -170,9 +170,9 @@ type Hub struct {
 	//	`projects/{project_number}/locations/global/hubs/{hub_id}`
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time the hub was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the hub was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional labels in key:value format. For more information about labels, see
 	// [Requirements for
 	// labels](https://cloud.google.com/resource-manager/docs/creating-managing-labels#requirements).
@@ -231,14 +231,14 @@ func (x *Hub) GetName() string {
 	return ""
 }
 
-func (x *Hub) GetCreateTime() *timestamp.Timestamp {
+func (x *Hub) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Hub) GetUpdateTime() *timestamp.Timestamp {
+func (x *Hub) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -363,9 +363,9 @@ type Spoke struct {
 	//	`projects/{project_number}/locations/{region}/spokes/{spoke_id}`
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time the spoke was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the spoke was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional labels in key:value format. For more information about labels, see
 	// [Requirements for
 	// labels](https://cloud.google.com/resource-manager/docs/creating-managing-labels#requirements).
@@ -427,14 +427,14 @@ func (x *Spoke) GetName() string {
 	return ""
 }
 
-func (x *Spoke) GetCreateTime() *timestamp.Timestamp {
+func (x *Spoke) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Spoke) GetUpdateTime() *timestamp.Timestamp {
+func (x *Spoke) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -799,7 +799,7 @@ type UpdateHubRequest struct {
 	// relative to the resource, not the full request. A field is overwritten if
 	// it is in the mask. If the user does not provide a mask, then all fields are
 	// overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The state that the hub should be in after the update.
 	Hub *Hub `protobuf:"bytes,2,opt,name=hub,proto3" json:"hub,omitempty"`
 	// Optional. A unique request ID (optional). If you specify this ID, you can use it
@@ -851,7 +851,7 @@ func (*UpdateHubRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_networkconnectivity_v1_hub_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *UpdateHubRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateHubRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1245,7 +1245,7 @@ type UpdateSpokeRequest struct {
 	// update_mask are relative to the resource, not the full request. A field is
 	// overwritten if it is in the mask. If the user does not provide a mask, then
 	// all fields are overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The state that the spoke should be in after the update.
 	Spoke *Spoke `protobuf:"bytes,2,opt,name=spoke,proto3" json:"spoke,omitempty"`
 	// Optional. A unique request ID (optional). If you specify this ID, you can use it
@@ -1297,7 +1297,7 @@ func (*UpdateSpokeRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_networkconnectivity_v1_hub_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *UpdateSpokeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSpokeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2217,8 +2217,8 @@ var file_google_cloud_networkconnectivity_v1_hub_proto_goTypes = []interface{}{
 	(*LocationMetadata)(nil),               // 21: google.cloud.networkconnectivity.v1.LocationMetadata
 	nil,                                    // 22: google.cloud.networkconnectivity.v1.Hub.LabelsEntry
 	nil,                                    // 23: google.cloud.networkconnectivity.v1.Spoke.LabelsEntry
-	(*timestamp.Timestamp)(nil),            // 24: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),           // 25: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),          // 24: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),          // 25: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),          // 26: google.longrunning.Operation
 }
 var file_google_cloud_networkconnectivity_v1_hub_proto_depIdxs = []int32{
diff --git a/networkconnectivity/go.mod b/networkconnectivity/go.mod
index e5bf1c132f7..a7a9342d5e7 100644
--- a/networkconnectivity/go.mod
+++ b/networkconnectivity/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/networkconnectivity
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/networkconnectivity/go.sum b/networkconnectivity/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/networkconnectivity/go.sum
+++ b/networkconnectivity/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/networkmanagement/aliasshim/aliasshim.go b/networkmanagement/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/networkmanagement/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/networkmanagement/apiv1/doc.go b/networkmanagement/apiv1/doc.go
index 0f5b8c6ab30..0fe4692a1a3 100644
--- a/networkmanagement/apiv1/doc.go
+++ b/networkmanagement/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &networkmanagementpb.ListConnectivityTestsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkmanagement/v1#ListConnectivityTestsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb#ListConnectivityTestsRequest.
 //	}
 //	it := c.ListConnectivityTests(ctx, req)
 //	for {
diff --git a/networkmanagement/apiv1/networkmanagementpb/connectivity_test.pb.go b/networkmanagement/apiv1/networkmanagementpb/connectivity_test.pb.go
index b01afdc803f..0d8690de6d1 100644
--- a/networkmanagement/apiv1/networkmanagementpb/connectivity_test.pb.go
+++ b/networkmanagement/apiv1/networkmanagementpb/connectivity_test.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/networkmanagement/v1/connectivity_test.proto
 
 package networkmanagementpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	status "google.golang.org/genproto/googleapis/rpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -238,9 +238,9 @@ type ConnectivityTest struct {
 	// Resource labels to represent user-provided metadata.
 	Labels map[string]string `protobuf:"bytes,8,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. The time the test was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the test's configuration was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The reachability details of this test from the latest run.
 	// The details are updated when creating a new test, updating an
 	// existing test, or triggering a one-time rerun of an existing test.
@@ -335,14 +335,14 @@ func (x *ConnectivityTest) GetLabels() map[string]string {
 	return nil
 }
 
-func (x *ConnectivityTest) GetCreateTime() *timestamp.Timestamp {
+func (x *ConnectivityTest) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ConnectivityTest) GetUpdateTime() *timestamp.Timestamp {
+func (x *ConnectivityTest) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -491,7 +491,7 @@ type ReachabilityDetails struct {
 	// The overall result of the test's configuration analysis.
 	Result ReachabilityDetails_Result `protobuf:"varint,1,opt,name=result,proto3,enum=google.cloud.networkmanagement.v1.ReachabilityDetails_Result" json:"result,omitempty"`
 	// The time of the configuration analysis.
-	VerifyTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=verify_time,json=verifyTime,proto3" json:"verify_time,omitempty"`
+	VerifyTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=verify_time,json=verifyTime,proto3" json:"verify_time,omitempty"`
 	// The details of a failure or a cancellation of reachability analysis.
 	Error *status.Status `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"`
 	// Result may contain a list of traces if a test has multiple possible
@@ -539,7 +539,7 @@ func (x *ReachabilityDetails) GetResult() ReachabilityDetails_Result {
 	return ReachabilityDetails_RESULT_UNSPECIFIED
 }
 
-func (x *ReachabilityDetails) GetVerifyTime() *timestamp.Timestamp {
+func (x *ReachabilityDetails) GetVerifyTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.VerifyTime
 	}
@@ -722,7 +722,7 @@ var file_google_cloud_networkmanagement_v1_connectivity_test_proto_goTypes = []i
 	(*Endpoint)(nil),                // 3: google.cloud.networkmanagement.v1.Endpoint
 	(*ReachabilityDetails)(nil),     // 4: google.cloud.networkmanagement.v1.ReachabilityDetails
 	nil,                             // 5: google.cloud.networkmanagement.v1.ConnectivityTest.LabelsEntry
-	(*timestamp.Timestamp)(nil),     // 6: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),   // 6: google.protobuf.Timestamp
 	(*status.Status)(nil),           // 7: google.rpc.Status
 	(*Trace)(nil),                   // 8: google.cloud.networkmanagement.v1.Trace
 }
diff --git a/networkmanagement/apiv1/networkmanagementpb/reachability.pb.go b/networkmanagement/apiv1/networkmanagementpb/reachability.pb.go
index 1bcd0e8a5d4..a8c22935d58 100644
--- a/networkmanagement/apiv1/networkmanagementpb/reachability.pb.go
+++ b/networkmanagement/apiv1/networkmanagementpb/reachability.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/networkmanagement/v1/reachability.proto
 
 package networkmanagementpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -349,7 +349,7 @@ type UpdateConnectivityTestRequest struct {
 
 	// Required. Mask of fields to update. At least one path must be supplied in
 	// this field.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Only fields specified in update_mask are updated.
 	Resource *ConnectivityTest `protobuf:"bytes,2,opt,name=resource,proto3" json:"resource,omitempty"`
 }
@@ -386,7 +386,7 @@ func (*UpdateConnectivityTestRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_networkmanagement_v1_reachability_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *UpdateConnectivityTestRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateConnectivityTestRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -509,9 +509,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Target of the operation - for example
 	// projects/project-1/locations/global/connectivityTests/test-1
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
@@ -557,14 +557,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_networkmanagement_v1_reachability_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -853,8 +853,8 @@ var file_google_cloud_networkmanagement_v1_reachability_proto_goTypes = []interf
 	(*RerunConnectivityTestRequest)(nil),  // 6: google.cloud.networkmanagement.v1.RerunConnectivityTestRequest
 	(*OperationMetadata)(nil),             // 7: google.cloud.networkmanagement.v1.OperationMetadata
 	(*ConnectivityTest)(nil),              // 8: google.cloud.networkmanagement.v1.ConnectivityTest
-	(*field_mask.FieldMask)(nil),          // 9: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),           // 10: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),         // 9: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),         // 10: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),         // 11: google.longrunning.Operation
 }
 var file_google_cloud_networkmanagement_v1_reachability_proto_depIdxs = []int32{
diff --git a/networkmanagement/apiv1/networkmanagementpb/trace.pb.go b/networkmanagement/apiv1/networkmanagementpb/trace.pb.go
index a8b7bb5aeb6..367d0e7649b 100644
--- a/networkmanagement/apiv1/networkmanagementpb/trace.pb.go
+++ b/networkmanagement/apiv1/networkmanagementpb/trace.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/networkmanagement/v1/trace.proto
 
 package networkmanagementpb
diff --git a/networkmanagement/apiv1/reachability_client.go b/networkmanagement/apiv1/reachability_client.go
index 9c517bf8116..d9cb6f88fa0 100644
--- a/networkmanagement/apiv1/reachability_client.go
+++ b/networkmanagement/apiv1/reachability_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	networkmanagementpb "cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	networkmanagementpb "google.golang.org/genproto/googleapis/cloud/networkmanagement/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/networkmanagement/apiv1/reachability_client_example_test.go b/networkmanagement/apiv1/reachability_client_example_test.go
index ff238e5cd6c..296dc2b9925 100644
--- a/networkmanagement/apiv1/reachability_client_example_test.go
+++ b/networkmanagement/apiv1/reachability_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	networkmanagement "cloud.google.com/go/networkmanagement/apiv1"
+	networkmanagementpb "cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb"
 	"google.golang.org/api/iterator"
-	networkmanagementpb "google.golang.org/genproto/googleapis/cloud/networkmanagement/v1"
 )
 
 func ExampleNewReachabilityClient() {
@@ -56,7 +56,7 @@ func ExampleReachabilityClient_ListConnectivityTests() {
 
 	req := &networkmanagementpb.ListConnectivityTestsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkmanagement/v1#ListConnectivityTestsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb#ListConnectivityTestsRequest.
 	}
 	it := c.ListConnectivityTests(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleReachabilityClient_GetConnectivityTest() {
 
 	req := &networkmanagementpb.GetConnectivityTestRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkmanagement/v1#GetConnectivityTestRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb#GetConnectivityTestRequest.
 	}
 	resp, err := c.GetConnectivityTest(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleReachabilityClient_CreateConnectivityTest() {
 
 	req := &networkmanagementpb.CreateConnectivityTestRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkmanagement/v1#CreateConnectivityTestRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb#CreateConnectivityTestRequest.
 	}
 	op, err := c.CreateConnectivityTest(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleReachabilityClient_UpdateConnectivityTest() {
 
 	req := &networkmanagementpb.UpdateConnectivityTestRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkmanagement/v1#UpdateConnectivityTestRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb#UpdateConnectivityTestRequest.
 	}
 	op, err := c.UpdateConnectivityTest(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleReachabilityClient_RerunConnectivityTest() {
 
 	req := &networkmanagementpb.RerunConnectivityTestRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkmanagement/v1#RerunConnectivityTestRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb#RerunConnectivityTestRequest.
 	}
 	op, err := c.RerunConnectivityTest(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleReachabilityClient_DeleteConnectivityTest() {
 
 	req := &networkmanagementpb.DeleteConnectivityTestRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/networkmanagement/v1#DeleteConnectivityTestRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/networkmanagement/apiv1/networkmanagementpb#DeleteConnectivityTestRequest.
 	}
 	op, err := c.DeleteConnectivityTest(ctx, req)
 	if err != nil {
diff --git a/networkmanagement/go.mod b/networkmanagement/go.mod
index fb2699f5391..2bbbf47e70d 100644
--- a/networkmanagement/go.mod
+++ b/networkmanagement/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/networkmanagement
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/networkmanagement/go.sum b/networkmanagement/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/networkmanagement/go.sum
+++ b/networkmanagement/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/notebooks/apiv1/doc.go b/notebooks/apiv1/doc.go
index 58a05f480b4..b124573e64f 100644
--- a/notebooks/apiv1/doc.go
+++ b/notebooks/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &notebookspb.ListRuntimesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ListRuntimesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ListRuntimesRequest.
 //	}
 //	it := c.ListRuntimes(ctx, req)
 //	for {
diff --git a/notebooks/apiv1/managed_notebook_client.go b/notebooks/apiv1/managed_notebook_client.go
index 22233bb275f..1cc7689daf2 100644
--- a/notebooks/apiv1/managed_notebook_client.go
+++ b/notebooks/apiv1/managed_notebook_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	notebookspb "cloud.google.com/go/notebooks/apiv1/notebookspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	notebookspb "google.golang.org/genproto/googleapis/cloud/notebooks/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/notebooks/apiv1/managed_notebook_client_example_test.go b/notebooks/apiv1/managed_notebook_client_example_test.go
index 9a930f408f4..51817b6e8e6 100644
--- a/notebooks/apiv1/managed_notebook_client_example_test.go
+++ b/notebooks/apiv1/managed_notebook_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	notebooks "cloud.google.com/go/notebooks/apiv1"
+	notebookspb "cloud.google.com/go/notebooks/apiv1/notebookspb"
 	"google.golang.org/api/iterator"
-	notebookspb "google.golang.org/genproto/googleapis/cloud/notebooks/v1"
 )
 
 func ExampleNewManagedNotebookClient() {
@@ -56,7 +56,7 @@ func ExampleManagedNotebookClient_ListRuntimes() {
 
 	req := &notebookspb.ListRuntimesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ListRuntimesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ListRuntimesRequest.
 	}
 	it := c.ListRuntimes(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleManagedNotebookClient_GetRuntime() {
 
 	req := &notebookspb.GetRuntimeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#GetRuntimeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#GetRuntimeRequest.
 	}
 	resp, err := c.GetRuntime(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleManagedNotebookClient_CreateRuntime() {
 
 	req := &notebookspb.CreateRuntimeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#CreateRuntimeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#CreateRuntimeRequest.
 	}
 	op, err := c.CreateRuntime(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleManagedNotebookClient_DeleteRuntime() {
 
 	req := &notebookspb.DeleteRuntimeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#DeleteRuntimeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#DeleteRuntimeRequest.
 	}
 	op, err := c.DeleteRuntime(ctx, req)
 	if err != nil {
@@ -170,7 +170,7 @@ func ExampleManagedNotebookClient_StartRuntime() {
 
 	req := &notebookspb.StartRuntimeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#StartRuntimeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#StartRuntimeRequest.
 	}
 	op, err := c.StartRuntime(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleManagedNotebookClient_StopRuntime() {
 
 	req := &notebookspb.StopRuntimeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#StopRuntimeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#StopRuntimeRequest.
 	}
 	op, err := c.StopRuntime(ctx, req)
 	if err != nil {
@@ -230,7 +230,7 @@ func ExampleManagedNotebookClient_SwitchRuntime() {
 
 	req := &notebookspb.SwitchRuntimeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#SwitchRuntimeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#SwitchRuntimeRequest.
 	}
 	op, err := c.SwitchRuntime(ctx, req)
 	if err != nil {
@@ -260,7 +260,7 @@ func ExampleManagedNotebookClient_ResetRuntime() {
 
 	req := &notebookspb.ResetRuntimeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ResetRuntimeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ResetRuntimeRequest.
 	}
 	op, err := c.ResetRuntime(ctx, req)
 	if err != nil {
@@ -290,7 +290,7 @@ func ExampleManagedNotebookClient_ReportRuntimeEvent() {
 
 	req := &notebookspb.ReportRuntimeEventRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ReportRuntimeEventRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ReportRuntimeEventRequest.
 	}
 	op, err := c.ReportRuntimeEvent(ctx, req)
 	if err != nil {
@@ -320,7 +320,7 @@ func ExampleManagedNotebookClient_RefreshRuntimeTokenInternal() {
 
 	req := &notebookspb.RefreshRuntimeTokenInternalRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#RefreshRuntimeTokenInternalRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#RefreshRuntimeTokenInternalRequest.
 	}
 	resp, err := c.RefreshRuntimeTokenInternal(ctx, req)
 	if err != nil {
diff --git a/notebooks/apiv1/notebook_client.go b/notebooks/apiv1/notebook_client.go
index 1ba09a571b1..2e00978ed51 100644
--- a/notebooks/apiv1/notebook_client.go
+++ b/notebooks/apiv1/notebook_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	notebookspb "cloud.google.com/go/notebooks/apiv1/notebookspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	notebookspb "google.golang.org/genproto/googleapis/cloud/notebooks/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/notebooks/apiv1/notebook_client_example_test.go b/notebooks/apiv1/notebook_client_example_test.go
index a888f2ada98..3f3fa9a2583 100644
--- a/notebooks/apiv1/notebook_client_example_test.go
+++ b/notebooks/apiv1/notebook_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	notebooks "cloud.google.com/go/notebooks/apiv1"
+	notebookspb "cloud.google.com/go/notebooks/apiv1/notebookspb"
 	"google.golang.org/api/iterator"
-	notebookspb "google.golang.org/genproto/googleapis/cloud/notebooks/v1"
 )
 
 func ExampleNewNotebookClient() {
@@ -56,7 +56,7 @@ func ExampleNotebookClient_ListInstances() {
 
 	req := &notebookspb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleNotebookClient_GetInstance() {
 
 	req := &notebookspb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleNotebookClient_CreateInstance() {
 
 	req := &notebookspb.CreateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#CreateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#CreateInstanceRequest.
 	}
 	op, err := c.CreateInstance(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleNotebookClient_RegisterInstance() {
 
 	req := &notebookspb.RegisterInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#RegisterInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#RegisterInstanceRequest.
 	}
 	op, err := c.RegisterInstance(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleNotebookClient_SetInstanceAccelerator() {
 
 	req := &notebookspb.SetInstanceAcceleratorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#SetInstanceAcceleratorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#SetInstanceAcceleratorRequest.
 	}
 	op, err := c.SetInstanceAccelerator(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleNotebookClient_SetInstanceMachineType() {
 
 	req := &notebookspb.SetInstanceMachineTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#SetInstanceMachineTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#SetInstanceMachineTypeRequest.
 	}
 	op, err := c.SetInstanceMachineType(ctx, req)
 	if err != nil {
@@ -232,7 +232,7 @@ func ExampleNotebookClient_UpdateInstanceConfig() {
 
 	req := &notebookspb.UpdateInstanceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#UpdateInstanceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#UpdateInstanceConfigRequest.
 	}
 	op, err := c.UpdateInstanceConfig(ctx, req)
 	if err != nil {
@@ -262,7 +262,7 @@ func ExampleNotebookClient_UpdateShieldedInstanceConfig() {
 
 	req := &notebookspb.UpdateShieldedInstanceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#UpdateShieldedInstanceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#UpdateShieldedInstanceConfigRequest.
 	}
 	op, err := c.UpdateShieldedInstanceConfig(ctx, req)
 	if err != nil {
@@ -292,7 +292,7 @@ func ExampleNotebookClient_SetInstanceLabels() {
 
 	req := &notebookspb.SetInstanceLabelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#SetInstanceLabelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#SetInstanceLabelsRequest.
 	}
 	op, err := c.SetInstanceLabels(ctx, req)
 	if err != nil {
@@ -322,7 +322,7 @@ func ExampleNotebookClient_UpdateInstanceMetadataItems() {
 
 	req := &notebookspb.UpdateInstanceMetadataItemsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#UpdateInstanceMetadataItemsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#UpdateInstanceMetadataItemsRequest.
 	}
 	resp, err := c.UpdateInstanceMetadataItems(ctx, req)
 	if err != nil {
@@ -347,7 +347,7 @@ func ExampleNotebookClient_DeleteInstance() {
 
 	req := &notebookspb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
@@ -375,7 +375,7 @@ func ExampleNotebookClient_StartInstance() {
 
 	req := &notebookspb.StartInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#StartInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#StartInstanceRequest.
 	}
 	op, err := c.StartInstance(ctx, req)
 	if err != nil {
@@ -405,7 +405,7 @@ func ExampleNotebookClient_StopInstance() {
 
 	req := &notebookspb.StopInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#StopInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#StopInstanceRequest.
 	}
 	op, err := c.StopInstance(ctx, req)
 	if err != nil {
@@ -435,7 +435,7 @@ func ExampleNotebookClient_ResetInstance() {
 
 	req := &notebookspb.ResetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ResetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ResetInstanceRequest.
 	}
 	op, err := c.ResetInstance(ctx, req)
 	if err != nil {
@@ -465,7 +465,7 @@ func ExampleNotebookClient_ReportInstanceInfo() {
 
 	req := &notebookspb.ReportInstanceInfoRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ReportInstanceInfoRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ReportInstanceInfoRequest.
 	}
 	op, err := c.ReportInstanceInfo(ctx, req)
 	if err != nil {
@@ -495,7 +495,7 @@ func ExampleNotebookClient_IsInstanceUpgradeable() {
 
 	req := &notebookspb.IsInstanceUpgradeableRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#IsInstanceUpgradeableRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#IsInstanceUpgradeableRequest.
 	}
 	resp, err := c.IsInstanceUpgradeable(ctx, req)
 	if err != nil {
@@ -520,7 +520,7 @@ func ExampleNotebookClient_GetInstanceHealth() {
 
 	req := &notebookspb.GetInstanceHealthRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#GetInstanceHealthRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#GetInstanceHealthRequest.
 	}
 	resp, err := c.GetInstanceHealth(ctx, req)
 	if err != nil {
@@ -545,7 +545,7 @@ func ExampleNotebookClient_UpgradeInstance() {
 
 	req := &notebookspb.UpgradeInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#UpgradeInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#UpgradeInstanceRequest.
 	}
 	op, err := c.UpgradeInstance(ctx, req)
 	if err != nil {
@@ -575,7 +575,7 @@ func ExampleNotebookClient_RollbackInstance() {
 
 	req := &notebookspb.RollbackInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#RollbackInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#RollbackInstanceRequest.
 	}
 	op, err := c.RollbackInstance(ctx, req)
 	if err != nil {
@@ -605,7 +605,7 @@ func ExampleNotebookClient_UpgradeInstanceInternal() {
 
 	req := &notebookspb.UpgradeInstanceInternalRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#UpgradeInstanceInternalRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#UpgradeInstanceInternalRequest.
 	}
 	op, err := c.UpgradeInstanceInternal(ctx, req)
 	if err != nil {
@@ -635,7 +635,7 @@ func ExampleNotebookClient_ListEnvironments() {
 
 	req := &notebookspb.ListEnvironmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ListEnvironmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ListEnvironmentsRequest.
 	}
 	it := c.ListEnvironments(ctx, req)
 	for {
@@ -666,7 +666,7 @@ func ExampleNotebookClient_GetEnvironment() {
 
 	req := &notebookspb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
@@ -691,7 +691,7 @@ func ExampleNotebookClient_CreateEnvironment() {
 
 	req := &notebookspb.CreateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#CreateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#CreateEnvironmentRequest.
 	}
 	op, err := c.CreateEnvironment(ctx, req)
 	if err != nil {
@@ -721,7 +721,7 @@ func ExampleNotebookClient_DeleteEnvironment() {
 
 	req := &notebookspb.DeleteEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#DeleteEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#DeleteEnvironmentRequest.
 	}
 	op, err := c.DeleteEnvironment(ctx, req)
 	if err != nil {
@@ -749,7 +749,7 @@ func ExampleNotebookClient_ListSchedules() {
 
 	req := &notebookspb.ListSchedulesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ListSchedulesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ListSchedulesRequest.
 	}
 	it := c.ListSchedules(ctx, req)
 	for {
@@ -780,7 +780,7 @@ func ExampleNotebookClient_GetSchedule() {
 
 	req := &notebookspb.GetScheduleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#GetScheduleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#GetScheduleRequest.
 	}
 	resp, err := c.GetSchedule(ctx, req)
 	if err != nil {
@@ -805,7 +805,7 @@ func ExampleNotebookClient_DeleteSchedule() {
 
 	req := &notebookspb.DeleteScheduleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#DeleteScheduleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#DeleteScheduleRequest.
 	}
 	op, err := c.DeleteSchedule(ctx, req)
 	if err != nil {
@@ -833,7 +833,7 @@ func ExampleNotebookClient_CreateSchedule() {
 
 	req := &notebookspb.CreateScheduleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#CreateScheduleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#CreateScheduleRequest.
 	}
 	op, err := c.CreateSchedule(ctx, req)
 	if err != nil {
@@ -863,7 +863,7 @@ func ExampleNotebookClient_TriggerSchedule() {
 
 	req := &notebookspb.TriggerScheduleRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#TriggerScheduleRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#TriggerScheduleRequest.
 	}
 	op, err := c.TriggerSchedule(ctx, req)
 	if err != nil {
@@ -893,7 +893,7 @@ func ExampleNotebookClient_ListExecutions() {
 
 	req := &notebookspb.ListExecutionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#ListExecutionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#ListExecutionsRequest.
 	}
 	it := c.ListExecutions(ctx, req)
 	for {
@@ -924,7 +924,7 @@ func ExampleNotebookClient_GetExecution() {
 
 	req := &notebookspb.GetExecutionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#GetExecutionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#GetExecutionRequest.
 	}
 	resp, err := c.GetExecution(ctx, req)
 	if err != nil {
@@ -949,7 +949,7 @@ func ExampleNotebookClient_DeleteExecution() {
 
 	req := &notebookspb.DeleteExecutionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#DeleteExecutionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#DeleteExecutionRequest.
 	}
 	op, err := c.DeleteExecution(ctx, req)
 	if err != nil {
@@ -977,7 +977,7 @@ func ExampleNotebookClient_CreateExecution() {
 
 	req := &notebookspb.CreateExecutionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/notebooks/v1#CreateExecutionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/notebooks/apiv1/notebookspb#CreateExecutionRequest.
 	}
 	op, err := c.CreateExecution(ctx, req)
 	if err != nil {
diff --git a/notebooks/apiv1/notebookspb/environment.pb.go b/notebooks/apiv1/notebookspb/environment.pb.go
index b6e7a96c275..d32034ad644 100644
--- a/notebooks/apiv1/notebookspb/environment.pb.go
+++ b/notebooks/apiv1/notebookspb/environment.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/environment.proto
 
 package notebookspb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -64,7 +64,7 @@ type Environment struct {
 	// Cloud Storage path. Example: `"gs://path-to-file/file-name"`
 	PostStartupScript string `protobuf:"bytes,8,opt,name=post_startup_script,json=postStartupScript,proto3" json:"post_startup_script,omitempty"`
 	// Output only. The time at which this environment was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 }
 
 func (x *Environment) Reset() {
@@ -148,7 +148,7 @@ func (x *Environment) GetPostStartupScript() string {
 	return ""
 }
 
-func (x *Environment) GetCreateTime() *timestamp.Timestamp {
+func (x *Environment) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -417,10 +417,10 @@ func file_google_cloud_notebooks_v1_environment_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_notebooks_v1_environment_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_google_cloud_notebooks_v1_environment_proto_goTypes = []interface{}{
-	(*Environment)(nil),         // 0: google.cloud.notebooks.v1.Environment
-	(*VmImage)(nil),             // 1: google.cloud.notebooks.v1.VmImage
-	(*ContainerImage)(nil),      // 2: google.cloud.notebooks.v1.ContainerImage
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(*Environment)(nil),           // 0: google.cloud.notebooks.v1.Environment
+	(*VmImage)(nil),               // 1: google.cloud.notebooks.v1.VmImage
+	(*ContainerImage)(nil),        // 2: google.cloud.notebooks.v1.ContainerImage
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
 }
 var file_google_cloud_notebooks_v1_environment_proto_depIdxs = []int32{
 	1, // 0: google.cloud.notebooks.v1.Environment.vm_image:type_name -> google.cloud.notebooks.v1.VmImage
diff --git a/notebooks/apiv1/notebookspb/event.pb.go b/notebooks/apiv1/notebookspb/event.pb.go
index d3e2925c29f..0079fc1f2c4 100644
--- a/notebooks/apiv1/notebookspb/event.pb.go
+++ b/notebooks/apiv1/notebookspb/event.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/event.proto
 
 package notebookspb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -111,7 +111,7 @@ type Event struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Event report time.
-	ReportTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=report_time,json=reportTime,proto3" json:"report_time,omitempty"`
+	ReportTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=report_time,json=reportTime,proto3" json:"report_time,omitempty"`
 	// Event type.
 	Type Event_EventType `protobuf:"varint,2,opt,name=type,proto3,enum=google.cloud.notebooks.v1.Event_EventType" json:"type,omitempty"`
 	// Optional. Event details. This field is used to pass event information.
@@ -150,7 +150,7 @@ func (*Event) Descriptor() ([]byte, []int) {
 	return file_google_cloud_notebooks_v1_event_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *Event) GetReportTime() *timestamp.Timestamp {
+func (x *Event) GetReportTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReportTime
 	}
@@ -230,10 +230,10 @@ func file_google_cloud_notebooks_v1_event_proto_rawDescGZIP() []byte {
 var file_google_cloud_notebooks_v1_event_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_notebooks_v1_event_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_cloud_notebooks_v1_event_proto_goTypes = []interface{}{
-	(Event_EventType)(0),        // 0: google.cloud.notebooks.v1.Event.EventType
-	(*Event)(nil),               // 1: google.cloud.notebooks.v1.Event
-	nil,                         // 2: google.cloud.notebooks.v1.Event.DetailsEntry
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(Event_EventType)(0),          // 0: google.cloud.notebooks.v1.Event.EventType
+	(*Event)(nil),                 // 1: google.cloud.notebooks.v1.Event
+	nil,                           // 2: google.cloud.notebooks.v1.Event.DetailsEntry
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
 }
 var file_google_cloud_notebooks_v1_event_proto_depIdxs = []int32{
 	3, // 0: google.cloud.notebooks.v1.Event.report_time:type_name -> google.protobuf.Timestamp
diff --git a/notebooks/apiv1/notebookspb/execution.pb.go b/notebooks/apiv1/notebookspb/execution.pb.go
index abd0f8a91a8..8c99e93aca3 100644
--- a/notebooks/apiv1/notebookspb/execution.pb.go
+++ b/notebooks/apiv1/notebookspb/execution.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/execution.proto
 
 package notebookspb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -626,9 +626,9 @@ type Execution struct {
 	// A brief description of this execution.
 	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. Time the Execution was instantiated.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time the Execution was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. State of the underlying AI Platform job.
 	State Execution_State `protobuf:"varint,7,opt,name=state,proto3,enum=google.cloud.notebooks.v1.Execution_State" json:"state,omitempty"`
 	// Output notebook file generated by this execution
@@ -697,14 +697,14 @@ func (x *Execution) GetDescription() string {
 	return ""
 }
 
-func (x *Execution) GetCreateTime() *timestamp.Timestamp {
+func (x *Execution) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Execution) GetUpdateTime() *timestamp.Timestamp {
+func (x *Execution) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1137,9 +1137,9 @@ var file_google_cloud_notebooks_v1_execution_proto_goTypes = []interface{}{
 	(*ExecutionTemplate_SchedulerAcceleratorConfig)(nil), // 6: google.cloud.notebooks.v1.ExecutionTemplate.SchedulerAcceleratorConfig
 	(*ExecutionTemplate_DataprocParameters)(nil),         // 7: google.cloud.notebooks.v1.ExecutionTemplate.DataprocParameters
 	(*ExecutionTemplate_VertexAIParameters)(nil),         // 8: google.cloud.notebooks.v1.ExecutionTemplate.VertexAIParameters
-	nil,                         // 9: google.cloud.notebooks.v1.ExecutionTemplate.LabelsEntry
-	nil,                         // 10: google.cloud.notebooks.v1.ExecutionTemplate.VertexAIParameters.EnvEntry
-	(*timestamp.Timestamp)(nil), // 11: google.protobuf.Timestamp
+	nil,                           // 9: google.cloud.notebooks.v1.ExecutionTemplate.LabelsEntry
+	nil,                           // 10: google.cloud.notebooks.v1.ExecutionTemplate.VertexAIParameters.EnvEntry
+	(*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp
 }
 var file_google_cloud_notebooks_v1_execution_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.notebooks.v1.ExecutionTemplate.scale_tier:type_name -> google.cloud.notebooks.v1.ExecutionTemplate.ScaleTier
diff --git a/notebooks/apiv1/notebookspb/instance.pb.go b/notebooks/apiv1/notebookspb/instance.pb.go
index 4ebce0df5ae..974fefe6490 100644
--- a/notebooks/apiv1/notebookspb/instance.pb.go
+++ b/notebooks/apiv1/notebookspb/instance.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/instance.proto
 
 package notebookspb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -756,9 +756,9 @@ type Instance struct {
 	// https://cloud.google.com/vpc/docs/using-routes#canipforward
 	CanIpForward bool `protobuf:"varint,39,opt,name=can_ip_forward,json=canIpForward,proto3" json:"can_ip_forward,omitempty"`
 	// Output only. Instance creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,23,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,23,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Instance update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,24,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,24,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Instance) Reset() {
@@ -1038,14 +1038,14 @@ func (x *Instance) GetCanIpForward() bool {
 	return false
 }
 
-func (x *Instance) GetCreateTime() *timestamp.Timestamp {
+func (x *Instance) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Instance) GetUpdateTime() *timestamp.Timestamp {
+func (x *Instance) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1411,7 +1411,7 @@ type Instance_UpgradeHistoryEntry struct {
 	// The state of this instance upgrade history entry.
 	State Instance_UpgradeHistoryEntry_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.cloud.notebooks.v1.Instance_UpgradeHistoryEntry_State" json:"state,omitempty"`
 	// The time that this instance upgrade history entry is created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Target VM Image. Format: ainotebooks-vm/project/image-name/name.
 	//
 	// Deprecated: Do not use.
@@ -1496,7 +1496,7 @@ func (x *Instance_UpgradeHistoryEntry) GetState() Instance_UpgradeHistoryEntry_S
 	return Instance_UpgradeHistoryEntry_STATE_UNSPECIFIED
 }
 
-func (x *Instance_UpgradeHistoryEntry) GetCreateTime() *timestamp.Timestamp {
+func (x *Instance_UpgradeHistoryEntry) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1945,7 +1945,7 @@ var file_google_cloud_notebooks_v1_instance_proto_goTypes = []interface{}{
 	(*Instance_Disk_GuestOsFeature)(nil),     // 16: google.cloud.notebooks.v1.Instance.Disk.GuestOsFeature
 	(*VmImage)(nil),                          // 17: google.cloud.notebooks.v1.VmImage
 	(*ContainerImage)(nil),                   // 18: google.cloud.notebooks.v1.ContainerImage
-	(*timestamp.Timestamp)(nil),              // 19: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),            // 19: google.protobuf.Timestamp
 }
 var file_google_cloud_notebooks_v1_instance_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.notebooks.v1.ReservationAffinity.consume_reservation_type:type_name -> google.cloud.notebooks.v1.ReservationAffinity.Type
diff --git a/notebooks/apiv1/notebookspb/instance_config.pb.go b/notebooks/apiv1/notebookspb/instance_config.pb.go
index 45356894530..28959c0f64f 100644
--- a/notebooks/apiv1/notebookspb/instance_config.pb.go
+++ b/notebooks/apiv1/notebookspb/instance_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/instance_config.proto
 
 package notebookspb
diff --git a/notebooks/apiv1/notebookspb/managed_service.pb.go b/notebooks/apiv1/notebookspb/managed_service.pb.go
index 04c97cf8fa9..f309572d653 100644
--- a/notebooks/apiv1/notebookspb/managed_service.pb.go
+++ b/notebooks/apiv1/notebookspb/managed_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/managed_service.proto
 
 package notebookspb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -759,7 +759,7 @@ type RefreshRuntimeTokenInternalResponse struct {
 	// The OAuth 2.0 access token.
 	AccessToken string `protobuf:"bytes,1,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"`
 	// Output only. Token expiration time.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *RefreshRuntimeTokenInternalResponse) Reset() {
@@ -801,7 +801,7 @@ func (x *RefreshRuntimeTokenInternalResponse) GetAccessToken() string {
 	return ""
 }
 
-func (x *RefreshRuntimeTokenInternalResponse) GetExpireTime() *timestamp.Timestamp {
+func (x *RefreshRuntimeTokenInternalResponse) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -1113,7 +1113,7 @@ var file_google_cloud_notebooks_v1_managed_service_proto_goTypes = []interface{}
 	(*Runtime)(nil),                             // 12: google.cloud.notebooks.v1.Runtime
 	(*RuntimeAcceleratorConfig)(nil),            // 13: google.cloud.notebooks.v1.RuntimeAcceleratorConfig
 	(*Event)(nil),                               // 14: google.cloud.notebooks.v1.Event
-	(*timestamp.Timestamp)(nil),                 // 15: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),               // 15: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),               // 16: google.longrunning.Operation
 }
 var file_google_cloud_notebooks_v1_managed_service_proto_depIdxs = []int32{
diff --git a/notebooks/apiv1/notebookspb/runtime.pb.go b/notebooks/apiv1/notebookspb/runtime.pb.go
index ea3b4251a8c..27c571cee39 100644
--- a/notebooks/apiv1/notebookspb/runtime.pb.go
+++ b/notebooks/apiv1/notebookspb/runtime.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/runtime.proto
 
 package notebookspb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -471,9 +471,9 @@ type Runtime struct {
 	// stats.
 	Metrics *RuntimeMetrics `protobuf:"bytes,7,opt,name=metrics,proto3" json:"metrics,omitempty"`
 	// Output only. Runtime creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,20,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,20,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Runtime update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,21,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,21,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Runtime) Reset() {
@@ -564,14 +564,14 @@ func (x *Runtime) GetMetrics() *RuntimeMetrics {
 	return nil
 }
 
-func (x *Runtime) GetCreateTime() *timestamp.Timestamp {
+func (x *Runtime) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Runtime) GetUpdateTime() *timestamp.Timestamp {
+func (x *Runtime) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2164,7 +2164,7 @@ var file_google_cloud_notebooks_v1_runtime_proto_goTypes = []interface{}{
 	nil,                                           // 21: google.cloud.notebooks.v1.VirtualMachineConfig.GuestAttributesEntry
 	nil,                                           // 22: google.cloud.notebooks.v1.VirtualMachineConfig.MetadataEntry
 	nil,                                           // 23: google.cloud.notebooks.v1.VirtualMachineConfig.LabelsEntry
-	(*timestamp.Timestamp)(nil),                   // 24: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                 // 24: google.protobuf.Timestamp
 	(*ContainerImage)(nil),                        // 25: google.cloud.notebooks.v1.ContainerImage
 }
 var file_google_cloud_notebooks_v1_runtime_proto_depIdxs = []int32{
diff --git a/notebooks/apiv1/notebookspb/schedule.pb.go b/notebooks/apiv1/notebookspb/schedule.pb.go
index 5501a722545..cb7c39fe744 100644
--- a/notebooks/apiv1/notebookspb/schedule.pb.go
+++ b/notebooks/apiv1/notebookspb/schedule.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/schedule.proto
 
 package notebookspb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -142,9 +142,9 @@ type Schedule struct {
 	// the default will be in UTC (also known as GMT).
 	TimeZone string `protobuf:"bytes,6,opt,name=time_zone,json=timeZone,proto3" json:"time_zone,omitempty"`
 	// Output only. Time the schedule was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time the schedule was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Notebook Execution Template corresponding to this schedule.
 	ExecutionTemplate *ExecutionTemplate `protobuf:"bytes,9,opt,name=execution_template,json=executionTemplate,proto3" json:"execution_template,omitempty"`
 	// Output only. The most recent execution names triggered from this schedule and their
@@ -226,14 +226,14 @@ func (x *Schedule) GetTimeZone() string {
 	return ""
 }
 
-func (x *Schedule) GetCreateTime() *timestamp.Timestamp {
+func (x *Schedule) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Schedule) GetUpdateTime() *timestamp.Timestamp {
+func (x *Schedule) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -344,11 +344,11 @@ func file_google_cloud_notebooks_v1_schedule_proto_rawDescGZIP() []byte {
 var file_google_cloud_notebooks_v1_schedule_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_notebooks_v1_schedule_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_notebooks_v1_schedule_proto_goTypes = []interface{}{
-	(Schedule_State)(0),         // 0: google.cloud.notebooks.v1.Schedule.State
-	(*Schedule)(nil),            // 1: google.cloud.notebooks.v1.Schedule
-	(*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp
-	(*ExecutionTemplate)(nil),   // 3: google.cloud.notebooks.v1.ExecutionTemplate
-	(*Execution)(nil),           // 4: google.cloud.notebooks.v1.Execution
+	(Schedule_State)(0),           // 0: google.cloud.notebooks.v1.Schedule.State
+	(*Schedule)(nil),              // 1: google.cloud.notebooks.v1.Schedule
+	(*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp
+	(*ExecutionTemplate)(nil),     // 3: google.cloud.notebooks.v1.ExecutionTemplate
+	(*Execution)(nil),             // 4: google.cloud.notebooks.v1.Execution
 }
 var file_google_cloud_notebooks_v1_schedule_proto_depIdxs = []int32{
 	0, // 0: google.cloud.notebooks.v1.Schedule.state:type_name -> google.cloud.notebooks.v1.Schedule.State
diff --git a/notebooks/apiv1/notebookspb/service.pb.go b/notebooks/apiv1/notebookspb/service.pb.go
index 57ea3dcd883..eb7e9e8a3d1 100644
--- a/notebooks/apiv1/notebookspb/service.pb.go
+++ b/notebooks/apiv1/notebookspb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/notebooks/v1/service.proto
 
 package notebookspb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -178,9 +178,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Name of the verb executed by the operation.
@@ -230,14 +230,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_notebooks_v1_service_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -3668,7 +3668,7 @@ var file_google_cloud_notebooks_v1_service_proto_goTypes = []interface{}{
 	nil,                                         // 45: google.cloud.notebooks.v1.UpdateInstanceMetadataItemsResponse.ItemsEntry
 	nil,                                         // 46: google.cloud.notebooks.v1.ReportInstanceInfoRequest.MetadataEntry
 	nil,                                         // 47: google.cloud.notebooks.v1.GetInstanceHealthResponse.HealthInfoEntry
-	(*timestamp.Timestamp)(nil),                 // 48: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),               // 48: google.protobuf.Timestamp
 	(*Instance)(nil),                            // 49: google.cloud.notebooks.v1.Instance
 	(Instance_AcceleratorType)(0),               // 50: google.cloud.notebooks.v1.Instance.AcceleratorType
 	(*InstanceConfig)(nil),                      // 51: google.cloud.notebooks.v1.InstanceConfig
diff --git a/notebooks/go.mod b/notebooks/go.mod
index c4c89b811c2..d2b5ca9c9be 100644
--- a/notebooks/go.mod
+++ b/notebooks/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/notebooks
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/notebooks/go.sum b/notebooks/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/notebooks/go.sum
+++ b/notebooks/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/optimization/aliasshim/aliasshim.go b/optimization/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/optimization/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/optimization/apiv1/doc.go b/optimization/apiv1/doc.go
index b05973f86df..86fa8af8560 100644
--- a/optimization/apiv1/doc.go
+++ b/optimization/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &optimizationpb.OptimizeToursRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/optimization/v1#OptimizeToursRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/optimization/apiv1/optimizationpb#OptimizeToursRequest.
 //	}
 //	resp, err := c.OptimizeTours(ctx, req)
 //	if err != nil {
diff --git a/optimization/apiv1/fleet_routing_client.go b/optimization/apiv1/fleet_routing_client.go
index dfc69968ee9..8ee75ec143a 100644
--- a/optimization/apiv1/fleet_routing_client.go
+++ b/optimization/apiv1/fleet_routing_client.go
@@ -25,11 +25,11 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	optimizationpb "cloud.google.com/go/optimization/apiv1/optimizationpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	optimizationpb "google.golang.org/genproto/googleapis/cloud/optimization/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/optimization/apiv1/fleet_routing_client_example_test.go b/optimization/apiv1/fleet_routing_client_example_test.go
index 5b03a888b50..3ecd3186dc7 100644
--- a/optimization/apiv1/fleet_routing_client_example_test.go
+++ b/optimization/apiv1/fleet_routing_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	optimization "cloud.google.com/go/optimization/apiv1"
-	optimizationpb "google.golang.org/genproto/googleapis/cloud/optimization/v1"
+	optimizationpb "cloud.google.com/go/optimization/apiv1/optimizationpb"
 )
 
 func ExampleNewFleetRoutingClient() {
@@ -55,7 +55,7 @@ func ExampleFleetRoutingClient_OptimizeTours() {
 
 	req := &optimizationpb.OptimizeToursRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/optimization/v1#OptimizeToursRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/optimization/apiv1/optimizationpb#OptimizeToursRequest.
 	}
 	resp, err := c.OptimizeTours(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleFleetRoutingClient_BatchOptimizeTours() {
 
 	req := &optimizationpb.BatchOptimizeToursRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/optimization/v1#BatchOptimizeToursRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/optimization/apiv1/optimizationpb#BatchOptimizeToursRequest.
 	}
 	op, err := c.BatchOptimizeTours(ctx, req)
 	if err != nil {
diff --git a/optimization/apiv1/optimizationpb/async_model.pb.go b/optimization/apiv1/optimizationpb/async_model.pb.go
index 429e549dc31..5ddeb2a55f0 100644
--- a/optimization/apiv1/optimizationpb/async_model.pb.go
+++ b/optimization/apiv1/optimizationpb/async_model.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/optimization/v1/async_model.proto
 
 package optimizationpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -424,9 +424,9 @@ type AsyncModelMetadata struct {
 	// For example, the error message if the operation is failed.
 	StateMessage string `protobuf:"bytes,2,opt,name=state_message,json=stateMessage,proto3" json:"state_message,omitempty"`
 	// The creation time of the operation.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The last update time of the operation.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *AsyncModelMetadata) Reset() {
@@ -475,14 +475,14 @@ func (x *AsyncModelMetadata) GetStateMessage() string {
 	return ""
 }
 
-func (x *AsyncModelMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *AsyncModelMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *AsyncModelMetadata) GetUpdateTime() *timestamp.Timestamp {
+func (x *AsyncModelMetadata) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -588,7 +588,7 @@ var file_google_cloud_optimization_v1_async_model_proto_goTypes = []interface{}{
 	(*GcsSource)(nil),             // 4: google.cloud.optimization.v1.GcsSource
 	(*GcsDestination)(nil),        // 5: google.cloud.optimization.v1.GcsDestination
 	(*AsyncModelMetadata)(nil),    // 6: google.cloud.optimization.v1.AsyncModelMetadata
-	(*timestamp.Timestamp)(nil),   // 7: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil), // 7: google.protobuf.Timestamp
 }
 var file_google_cloud_optimization_v1_async_model_proto_depIdxs = []int32{
 	4, // 0: google.cloud.optimization.v1.InputConfig.gcs_source:type_name -> google.cloud.optimization.v1.GcsSource
diff --git a/optimization/apiv1/optimizationpb/fleet_routing.pb.go b/optimization/apiv1/optimizationpb/fleet_routing.pb.go
index 011e4bfe5b1..5eacf1741af 100644
--- a/optimization/apiv1/optimizationpb/fleet_routing.pb.go
+++ b/optimization/apiv1/optimizationpb/fleet_routing.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/optimization/v1/fleet_routing.proto
 
 package optimizationpb
@@ -25,8 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	latlng "google.golang.org/genproto/googleapis/type/latlng"
@@ -35,6 +33,8 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -584,7 +584,7 @@ type OptimizeToursRequest struct {
 	//
 	// For asynchronous requests, the server will generate a solution (if
 	// possible) before the timeout has elapsed.
-	Timeout *duration.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,2,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Shipment model to solve.
 	Model *ShipmentModel `protobuf:"bytes,3,opt,name=model,proto3" json:"model,omitempty"`
 	// By default, the solving mode is `DEFAULT_SOLVE` (0).
@@ -783,7 +783,7 @@ func (x *OptimizeToursRequest) GetParent() string {
 	return ""
 }
 
-func (x *OptimizeToursRequest) GetTimeout() *duration.Duration {
+func (x *OptimizeToursRequest) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -1150,10 +1150,10 @@ type ShipmentModel struct {
 	// you should set the global time limits to that day).
 	// If unset, 00:00:00 UTC, January 1, 1970 (i.e. seconds: 0, nanos: 0) is used
 	// as default.
-	GlobalStartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=global_start_time,json=globalStartTime,proto3" json:"global_start_time,omitempty"`
+	GlobalStartTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=global_start_time,json=globalStartTime,proto3" json:"global_start_time,omitempty"`
 	// If unset, 00:00:00 UTC, January 1, 1971 (i.e. seconds: 31536000, nanos: 0)
 	// is used as default.
-	GlobalEndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=global_end_time,json=globalEndTime,proto3" json:"global_end_time,omitempty"`
+	GlobalEndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=global_end_time,json=globalEndTime,proto3" json:"global_end_time,omitempty"`
 	// The "global duration" of the overall plan is the difference between the
 	// earliest effective start time and the latest effective end time of
 	// all vehicles. Users can assign a cost per hour to that quantity to try
@@ -1351,14 +1351,14 @@ func (x *ShipmentModel) GetMaxActiveVehicles() int32 {
 	return 0
 }
 
-func (x *ShipmentModel) GetGlobalStartTime() *timestamp.Timestamp {
+func (x *ShipmentModel) GetGlobalStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.GlobalStartTime
 	}
 	return nil
 }
 
-func (x *ShipmentModel) GetGlobalEndTime() *timestamp.Timestamp {
+func (x *ShipmentModel) GetGlobalEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.GlobalEndTime
 	}
@@ -1517,14 +1517,14 @@ type Shipment struct {
 	// the more constraining limit is used for each possible pickup/delivery pair.
 	// As of 2017/10, detours are only supported when travel durations do not
 	// depend on vehicles.
-	PickupToDeliveryAbsoluteDetourLimit *duration.Duration `protobuf:"bytes,9,opt,name=pickup_to_delivery_absolute_detour_limit,json=pickupToDeliveryAbsoluteDetourLimit,proto3" json:"pickup_to_delivery_absolute_detour_limit,omitempty"`
+	PickupToDeliveryAbsoluteDetourLimit *durationpb.Duration `protobuf:"bytes,9,opt,name=pickup_to_delivery_absolute_detour_limit,json=pickupToDeliveryAbsoluteDetourLimit,proto3" json:"pickup_to_delivery_absolute_detour_limit,omitempty"`
 	// Specifies the maximum duration from start of pickup to start of delivery of
 	// a shipment. If specified, it must be nonnegative, and the shipment must
 	// contain at least a pickup and a delivery. This does not depend on which
 	// alternatives are selected for pickup and delivery, nor on vehicle speed.
 	// This can be specified alongside maximum detour constraints: the solution
 	// will respect both specifications.
-	PickupToDeliveryTimeLimit *duration.Duration `protobuf:"bytes,10,opt,name=pickup_to_delivery_time_limit,json=pickupToDeliveryTimeLimit,proto3" json:"pickup_to_delivery_time_limit,omitempty"`
+	PickupToDeliveryTimeLimit *durationpb.Duration `protobuf:"bytes,10,opt,name=pickup_to_delivery_time_limit,json=pickupToDeliveryTimeLimit,proto3" json:"pickup_to_delivery_time_limit,omitempty"`
 	// Non-empty string specifying a "type" for this shipment.
 	// This feature can be used to define incompatibilities or requirements
 	// between `shipment_types` (see `shipment_type_incompatibilities` and
@@ -1641,14 +1641,14 @@ func (x *Shipment) GetPickupToDeliveryRelativeDetourLimit() float64 {
 	return 0
 }
 
-func (x *Shipment) GetPickupToDeliveryAbsoluteDetourLimit() *duration.Duration {
+func (x *Shipment) GetPickupToDeliveryAbsoluteDetourLimit() *durationpb.Duration {
 	if x != nil {
 		return x.PickupToDeliveryAbsoluteDetourLimit
 	}
 	return nil
 }
 
-func (x *Shipment) GetPickupToDeliveryTimeLimit() *duration.Duration {
+func (x *Shipment) GetPickupToDeliveryTimeLimit() *durationpb.Duration {
 	if x != nil {
 		return x.PickupToDeliveryTimeLimit
 	}
@@ -1964,7 +1964,7 @@ type Vehicle struct {
 	//
 	// If a visit request has multiple types, a duration will be added for each
 	// type in the map.
-	ExtraVisitDurationForVisitType map[string]*duration.Duration `protobuf:"bytes,24,rep,name=extra_visit_duration_for_visit_type,json=extraVisitDurationForVisitType,proto3" json:"extra_visit_duration_for_visit_type,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ExtraVisitDurationForVisitType map[string]*durationpb.Duration `protobuf:"bytes,24,rep,name=extra_visit_duration_for_visit_type,json=extraVisitDurationForVisitType,proto3" json:"extra_visit_duration_for_visit_type,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Describes the break schedule to be enforced on this vehicle.
 	// If empty, no breaks will be scheduled for this vehicle.
 	BreakRule *BreakRule `protobuf:"bytes,25,opt,name=break_rule,json=breakRule,proto3" json:"break_rule,omitempty"`
@@ -2179,7 +2179,7 @@ func (x *Vehicle) GetRouteDistanceLimit() *DistanceLimit {
 	return nil
 }
 
-func (x *Vehicle) GetExtraVisitDurationForVisitType() map[string]*duration.Duration {
+func (x *Vehicle) GetExtraVisitDurationForVisitType() map[string]*durationpb.Duration {
 	if x != nil {
 		return x.ExtraVisitDurationForVisitType
 	}
@@ -2266,14 +2266,14 @@ type TimeWindow struct {
 
 	// The hard time window start time. If unspecified it will be set to
 	// `ShipmentModel.global_start_time`.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The hard time window end time. If unspecified it will be set to
 	// `ShipmentModel.global_end_time`.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The soft start time of the time window.
-	SoftStartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=soft_start_time,json=softStartTime,proto3" json:"soft_start_time,omitempty"`
+	SoftStartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=soft_start_time,json=softStartTime,proto3" json:"soft_start_time,omitempty"`
 	// The soft end time of the time window.
-	SoftEndTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=soft_end_time,json=softEndTime,proto3" json:"soft_end_time,omitempty"`
+	SoftEndTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=soft_end_time,json=softEndTime,proto3" json:"soft_end_time,omitempty"`
 	// A cost per hour added to other costs in the model if the event occurs
 	// before soft_start_time, computed as:
 	//
@@ -2336,28 +2336,28 @@ func (*TimeWindow) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *TimeWindow) GetStartTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *TimeWindow) GetEndTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
 	return nil
 }
 
-func (x *TimeWindow) GetSoftStartTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetSoftStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SoftStartTime
 	}
 	return nil
 }
 
-func (x *TimeWindow) GetSoftEndTime() *timestamp.Timestamp {
+func (x *TimeWindow) GetSoftEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SoftEndTime
 	}
@@ -2633,7 +2633,7 @@ type TransitionAttributes struct {
 	//
 	// This delay always occurs *after* finishing the source visit and *before*
 	// starting the destination visit.
-	Delay *duration.Duration `protobuf:"bytes,8,opt,name=delay,proto3" json:"delay,omitempty"`
+	Delay *durationpb.Duration `protobuf:"bytes,8,opt,name=delay,proto3" json:"delay,omitempty"`
 }
 
 func (x *TransitionAttributes) Reset() {
@@ -2717,7 +2717,7 @@ func (x *TransitionAttributes) GetDistanceLimit() *DistanceLimit {
 	return nil
 }
 
-func (x *TransitionAttributes) GetDelay() *duration.Duration {
+func (x *TransitionAttributes) GetDelay() *durationpb.Duration {
 	if x != nil {
 		return x.Delay
 	}
@@ -3063,9 +3063,9 @@ type ShipmentRoute struct {
 	// `ShipmentModel.vehicles(vehicle_index).label`, if specified.
 	VehicleLabel string `protobuf:"bytes,2,opt,name=vehicle_label,json=vehicleLabel,proto3" json:"vehicle_label,omitempty"`
 	// Time at which the vehicle starts its route.
-	VehicleStartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=vehicle_start_time,json=vehicleStartTime,proto3" json:"vehicle_start_time,omitempty"`
+	VehicleStartTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=vehicle_start_time,json=vehicleStartTime,proto3" json:"vehicle_start_time,omitempty"`
 	// Time at which the vehicle finishes its route.
-	VehicleEndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=vehicle_end_time,json=vehicleEndTime,proto3" json:"vehicle_end_time,omitempty"`
+	VehicleEndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=vehicle_end_time,json=vehicleEndTime,proto3" json:"vehicle_end_time,omitempty"`
 	// Ordered sequence of visits representing a route.
 	// visits[i] is the i-th visit in the route.
 	// If this field is empty, the vehicle is considered as unused.
@@ -3136,7 +3136,7 @@ type ShipmentRoute struct {
 	// from the vehicle's start_location to its `end_location`.
 	//
 	// Deprecated: Do not use.
-	VehicleDetour *duration.Duration `protobuf:"bytes,15,opt,name=vehicle_detour,json=vehicleDetour,proto3" json:"vehicle_detour,omitempty"`
+	VehicleDetour *durationpb.Duration `protobuf:"bytes,15,opt,name=vehicle_detour,json=vehicleDetour,proto3" json:"vehicle_detour,omitempty"`
 	// Deprecated: Use [ShipmentRoute.Transition.delay_duration][] instead.
 	// Delay occurring before the vehicle end. See
 	// [TransitionAttributes.delay][google.cloud.optimization.v1.TransitionAttributes.delay].
@@ -3191,14 +3191,14 @@ func (x *ShipmentRoute) GetVehicleLabel() string {
 	return ""
 }
 
-func (x *ShipmentRoute) GetVehicleStartTime() *timestamp.Timestamp {
+func (x *ShipmentRoute) GetVehicleStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.VehicleStartTime
 	}
 	return nil
 }
 
-func (x *ShipmentRoute) GetVehicleEndTime() *timestamp.Timestamp {
+func (x *ShipmentRoute) GetVehicleEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.VehicleEndTime
 	}
@@ -3278,7 +3278,7 @@ func (x *ShipmentRoute) GetTravelSteps() []*ShipmentRoute_TravelStep {
 }
 
 // Deprecated: Do not use.
-func (x *ShipmentRoute) GetVehicleDetour() *duration.Duration {
+func (x *ShipmentRoute) GetVehicleDetour() *durationpb.Duration {
 	if x != nil {
 		return x.VehicleDetour
 	}
@@ -3378,19 +3378,19 @@ type AggregatedMetrics struct {
 	// counts once.
 	PerformedShipmentCount int32 `protobuf:"varint,1,opt,name=performed_shipment_count,json=performedShipmentCount,proto3" json:"performed_shipment_count,omitempty"`
 	// Total travel duration for a route or a solution.
-	TravelDuration *duration.Duration `protobuf:"bytes,2,opt,name=travel_duration,json=travelDuration,proto3" json:"travel_duration,omitempty"`
+	TravelDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=travel_duration,json=travelDuration,proto3" json:"travel_duration,omitempty"`
 	// Total wait duration for a route or a solution.
-	WaitDuration *duration.Duration `protobuf:"bytes,3,opt,name=wait_duration,json=waitDuration,proto3" json:"wait_duration,omitempty"`
+	WaitDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=wait_duration,json=waitDuration,proto3" json:"wait_duration,omitempty"`
 	// Total delay duration for a route or a solution.
-	DelayDuration *duration.Duration `protobuf:"bytes,4,opt,name=delay_duration,json=delayDuration,proto3" json:"delay_duration,omitempty"`
+	DelayDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=delay_duration,json=delayDuration,proto3" json:"delay_duration,omitempty"`
 	// Total break duration for a route or a solution.
-	BreakDuration *duration.Duration `protobuf:"bytes,5,opt,name=break_duration,json=breakDuration,proto3" json:"break_duration,omitempty"`
+	BreakDuration *durationpb.Duration `protobuf:"bytes,5,opt,name=break_duration,json=breakDuration,proto3" json:"break_duration,omitempty"`
 	// Total visit duration for a route or a solution.
-	VisitDuration *duration.Duration `protobuf:"bytes,6,opt,name=visit_duration,json=visitDuration,proto3" json:"visit_duration,omitempty"`
+	VisitDuration *durationpb.Duration `protobuf:"bytes,6,opt,name=visit_duration,json=visitDuration,proto3" json:"visit_duration,omitempty"`
 	// The total duration should be equal to the sum of all durations above.
 	// For routes, it also corresponds to [ShipmentRoute.vehicle_end_time][google.cloud.optimization.v1.ShipmentRoute.vehicle_end_time] -
 	// [ShipmentRoute.vehicle_start_time][google.cloud.optimization.v1.ShipmentRoute.vehicle_start_time].
-	TotalDuration *duration.Duration `protobuf:"bytes,7,opt,name=total_duration,json=totalDuration,proto3" json:"total_duration,omitempty"`
+	TotalDuration *durationpb.Duration `protobuf:"bytes,7,opt,name=total_duration,json=totalDuration,proto3" json:"total_duration,omitempty"`
 	// Total travel distance for a route or a solution.
 	TravelDistanceMeters float64 `protobuf:"fixed64,8,opt,name=travel_distance_meters,json=travelDistanceMeters,proto3" json:"travel_distance_meters,omitempty"`
 	// Maximum load achieved over the entire route (resp. solution), for each of
@@ -3449,42 +3449,42 @@ func (x *AggregatedMetrics) GetPerformedShipmentCount() int32 {
 	return 0
 }
 
-func (x *AggregatedMetrics) GetTravelDuration() *duration.Duration {
+func (x *AggregatedMetrics) GetTravelDuration() *durationpb.Duration {
 	if x != nil {
 		return x.TravelDuration
 	}
 	return nil
 }
 
-func (x *AggregatedMetrics) GetWaitDuration() *duration.Duration {
+func (x *AggregatedMetrics) GetWaitDuration() *durationpb.Duration {
 	if x != nil {
 		return x.WaitDuration
 	}
 	return nil
 }
 
-func (x *AggregatedMetrics) GetDelayDuration() *duration.Duration {
+func (x *AggregatedMetrics) GetDelayDuration() *durationpb.Duration {
 	if x != nil {
 		return x.DelayDuration
 	}
 	return nil
 }
 
-func (x *AggregatedMetrics) GetBreakDuration() *duration.Duration {
+func (x *AggregatedMetrics) GetBreakDuration() *durationpb.Duration {
 	if x != nil {
 		return x.BreakDuration
 	}
 	return nil
 }
 
-func (x *AggregatedMetrics) GetVisitDuration() *duration.Duration {
+func (x *AggregatedMetrics) GetVisitDuration() *durationpb.Duration {
 	if x != nil {
 		return x.VisitDuration
 	}
 	return nil
 }
 
-func (x *AggregatedMetrics) GetTotalDuration() *duration.Duration {
+func (x *AggregatedMetrics) GetTotalDuration() *durationpb.Duration {
 	if x != nil {
 		return x.TotalDuration
 	}
@@ -3954,10 +3954,10 @@ type OptimizeToursResponse_Metrics struct {
 	UsedVehicleCount int32 `protobuf:"varint,3,opt,name=used_vehicle_count,json=usedVehicleCount,proto3" json:"used_vehicle_count,omitempty"`
 	// The earliest start time for a used vehicle, computed as the minimum over
 	// all used vehicles of [ShipmentRoute.vehicle_start_time][google.cloud.optimization.v1.ShipmentRoute.vehicle_start_time].
-	EarliestVehicleStartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=earliest_vehicle_start_time,json=earliestVehicleStartTime,proto3" json:"earliest_vehicle_start_time,omitempty"`
+	EarliestVehicleStartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=earliest_vehicle_start_time,json=earliestVehicleStartTime,proto3" json:"earliest_vehicle_start_time,omitempty"`
 	// The latest end time for a used vehicle, computed as the maximum over all
 	// used vehicles of [ShipmentRoute.vehicle_end_time][google.cloud.optimization.v1.ShipmentRoute.vehicle_end_time].
-	LatestVehicleEndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=latest_vehicle_end_time,json=latestVehicleEndTime,proto3" json:"latest_vehicle_end_time,omitempty"`
+	LatestVehicleEndTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=latest_vehicle_end_time,json=latestVehicleEndTime,proto3" json:"latest_vehicle_end_time,omitempty"`
 	// Cost of the solution, broken down by cost-related request fields.
 	// The keys are proto paths, relative to the input OptimizeToursRequest,
 	// e.g. "model.shipments.pickups.cost", and the values are the total cost
@@ -4025,14 +4025,14 @@ func (x *OptimizeToursResponse_Metrics) GetUsedVehicleCount() int32 {
 	return 0
 }
 
-func (x *OptimizeToursResponse_Metrics) GetEarliestVehicleStartTime() *timestamp.Timestamp {
+func (x *OptimizeToursResponse_Metrics) GetEarliestVehicleStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EarliestVehicleStartTime
 	}
 	return nil
 }
 
-func (x *OptimizeToursResponse_Metrics) GetLatestVehicleEndTime() *timestamp.Timestamp {
+func (x *OptimizeToursResponse_Metrics) GetLatestVehicleEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LatestVehicleEndTime
 	}
@@ -4229,7 +4229,7 @@ type ShipmentModel_PrecedenceRule struct {
 	// Indicates if the "second" event is a delivery.
 	SecondIsDelivery bool `protobuf:"varint,4,opt,name=second_is_delivery,json=secondIsDelivery,proto3" json:"second_is_delivery,omitempty"`
 	// The offset between the "first" and "second" event. It can be negative.
-	OffsetDuration *duration.Duration `protobuf:"bytes,5,opt,name=offset_duration,json=offsetDuration,proto3" json:"offset_duration,omitempty"`
+	OffsetDuration *durationpb.Duration `protobuf:"bytes,5,opt,name=offset_duration,json=offsetDuration,proto3" json:"offset_duration,omitempty"`
 }
 
 func (x *ShipmentModel_PrecedenceRule) Reset() {
@@ -4292,7 +4292,7 @@ func (x *ShipmentModel_PrecedenceRule) GetSecondIsDelivery() bool {
 	return false
 }
 
-func (x *ShipmentModel_PrecedenceRule) GetOffsetDuration() *duration.Duration {
+func (x *ShipmentModel_PrecedenceRule) GetOffsetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.OffsetDuration
 	}
@@ -4379,7 +4379,7 @@ type ShipmentModel_DurationDistanceMatrix_Row struct {
 
 	// Duration values for a given row. It must have as many elements as
 	// [ShipmentModel.duration_distance_matrix_dst_tags][google.cloud.optimization.v1.ShipmentModel.duration_distance_matrix_dst_tags].
-	Durations []*duration.Duration `protobuf:"bytes,1,rep,name=durations,proto3" json:"durations,omitempty"`
+	Durations []*durationpb.Duration `protobuf:"bytes,1,rep,name=durations,proto3" json:"durations,omitempty"`
 	// Distance values for a given row. If no costs or constraints refer to
 	// distances in the model, this can be left empty; otherwise it must have
 	// as many elements as `durations`.
@@ -4418,7 +4418,7 @@ func (*ShipmentModel_DurationDistanceMatrix_Row) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{4, 0, 0}
 }
 
-func (x *ShipmentModel_DurationDistanceMatrix_Row) GetDurations() []*duration.Duration {
+func (x *ShipmentModel_DurationDistanceMatrix_Row) GetDurations() []*durationpb.Duration {
 	if x != nil {
 		return x.Durations
 	}
@@ -4443,11 +4443,11 @@ type ShipmentModel_BreakRule_BreakRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. Lower bound (inclusive) on the start of the break.
-	EarliestStartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=earliest_start_time,json=earliestStartTime,proto3" json:"earliest_start_time,omitempty"`
+	EarliestStartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=earliest_start_time,json=earliestStartTime,proto3" json:"earliest_start_time,omitempty"`
 	// Required. Upper bound (inclusive) on the start of the break.
-	LatestStartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=latest_start_time,json=latestStartTime,proto3" json:"latest_start_time,omitempty"`
+	LatestStartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=latest_start_time,json=latestStartTime,proto3" json:"latest_start_time,omitempty"`
 	// Required. Minimum duration of the break. Must be positive.
-	MinDuration *duration.Duration `protobuf:"bytes,3,opt,name=min_duration,json=minDuration,proto3" json:"min_duration,omitempty"`
+	MinDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=min_duration,json=minDuration,proto3" json:"min_duration,omitempty"`
 }
 
 func (x *ShipmentModel_BreakRule_BreakRequest) Reset() {
@@ -4482,21 +4482,21 @@ func (*ShipmentModel_BreakRule_BreakRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{4, 2, 0}
 }
 
-func (x *ShipmentModel_BreakRule_BreakRequest) GetEarliestStartTime() *timestamp.Timestamp {
+func (x *ShipmentModel_BreakRule_BreakRequest) GetEarliestStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EarliestStartTime
 	}
 	return nil
 }
 
-func (x *ShipmentModel_BreakRule_BreakRequest) GetLatestStartTime() *timestamp.Timestamp {
+func (x *ShipmentModel_BreakRule_BreakRequest) GetLatestStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LatestStartTime
 	}
 	return nil
 }
 
-func (x *ShipmentModel_BreakRule_BreakRequest) GetMinDuration() *duration.Duration {
+func (x *ShipmentModel_BreakRule_BreakRequest) GetMinDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MinDuration
 	}
@@ -4547,11 +4547,11 @@ type ShipmentModel_BreakRule_FrequencyConstraint struct {
 
 	// Required. Minimum break duration for this constraint. Nonnegative.
 	// See description of `FrequencyConstraint`.
-	MinBreakDuration *duration.Duration `protobuf:"bytes,1,opt,name=min_break_duration,json=minBreakDuration,proto3" json:"min_break_duration,omitempty"`
+	MinBreakDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=min_break_duration,json=minBreakDuration,proto3" json:"min_break_duration,omitempty"`
 	// Required. Maximum allowed span of any interval of time in the route that does not
 	// include at least partially a break of `duration >=
 	// min_break_duration`. Must be positive.
-	MaxInterBreakDuration *duration.Duration `protobuf:"bytes,2,opt,name=max_inter_break_duration,json=maxInterBreakDuration,proto3" json:"max_inter_break_duration,omitempty"`
+	MaxInterBreakDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=max_inter_break_duration,json=maxInterBreakDuration,proto3" json:"max_inter_break_duration,omitempty"`
 }
 
 func (x *ShipmentModel_BreakRule_FrequencyConstraint) Reset() {
@@ -4586,14 +4586,14 @@ func (*ShipmentModel_BreakRule_FrequencyConstraint) Descriptor() ([]byte, []int)
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{4, 2, 1}
 }
 
-func (x *ShipmentModel_BreakRule_FrequencyConstraint) GetMinBreakDuration() *duration.Duration {
+func (x *ShipmentModel_BreakRule_FrequencyConstraint) GetMinBreakDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MinBreakDuration
 	}
 	return nil
 }
 
-func (x *ShipmentModel_BreakRule_FrequencyConstraint) GetMaxInterBreakDuration() *duration.Duration {
+func (x *ShipmentModel_BreakRule_FrequencyConstraint) GetMaxInterBreakDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MaxInterBreakDuration
 	}
@@ -4648,7 +4648,7 @@ type Shipment_VisitRequest struct {
 	// Duration of the visit, i.e. time spent by the vehicle between arrival
 	// and departure (to be added to the possible waiting time; see
 	// `time_windows`).
-	Duration *duration.Duration `protobuf:"bytes,7,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,7,opt,name=duration,proto3" json:"duration,omitempty"`
 	// Cost to service this visit request on a vehicle route. This can be used
 	// to pay different costs for each alternative pickup or delivery of a
 	// shipment. This cost must be in the same unit as `Shipment.penalty_cost`
@@ -4749,7 +4749,7 @@ func (x *Shipment_VisitRequest) GetTimeWindows() []*TimeWindow {
 	return nil
 }
 
-func (x *Shipment_VisitRequest) GetDuration() *duration.Duration {
+func (x *Shipment_VisitRequest) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -4945,14 +4945,14 @@ type Vehicle_DurationLimit struct {
 	unknownFields protoimpl.UnknownFields
 
 	// A hard limit constraining the duration to be at most max_duration.
-	MaxDuration *duration.Duration `protobuf:"bytes,1,opt,name=max_duration,json=maxDuration,proto3" json:"max_duration,omitempty"`
+	MaxDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=max_duration,json=maxDuration,proto3" json:"max_duration,omitempty"`
 	// A soft limit not enforcing a maximum duration limit, but when violated
 	// makes the route incur a cost. This cost adds up to other costs defined in
 	// the model, with the same unit.
 	//
 	// If defined, `soft_max_duration` must be nonnegative. If max_duration is
 	// also defined, `soft_max_duration` must be less than max_duration.
-	SoftMaxDuration *duration.Duration `protobuf:"bytes,2,opt,name=soft_max_duration,json=softMaxDuration,proto3" json:"soft_max_duration,omitempty"`
+	SoftMaxDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=soft_max_duration,json=softMaxDuration,proto3" json:"soft_max_duration,omitempty"`
 	// Cost per hour incurred if the `soft_max_duration` threshold is violated.
 	// The additional cost is 0 if the duration is under the threshold,
 	// otherwise the cost depends on the duration as follows:
@@ -4973,7 +4973,7 @@ type Vehicle_DurationLimit struct {
 	// day:
 	//
 	//	`max_duration - quadratic_soft_max_duration <= 86400 seconds`
-	QuadraticSoftMaxDuration *duration.Duration `protobuf:"bytes,4,opt,name=quadratic_soft_max_duration,json=quadraticSoftMaxDuration,proto3" json:"quadratic_soft_max_duration,omitempty"`
+	QuadraticSoftMaxDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=quadratic_soft_max_duration,json=quadraticSoftMaxDuration,proto3" json:"quadratic_soft_max_duration,omitempty"`
 	// Cost per square hour incurred if the
 	// `quadratic_soft_max_duration` threshold is violated.
 	//
@@ -5023,14 +5023,14 @@ func (*Vehicle_DurationLimit) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{8, 1}
 }
 
-func (x *Vehicle_DurationLimit) GetMaxDuration() *duration.Duration {
+func (x *Vehicle_DurationLimit) GetMaxDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MaxDuration
 	}
 	return nil
 }
 
-func (x *Vehicle_DurationLimit) GetSoftMaxDuration() *duration.Duration {
+func (x *Vehicle_DurationLimit) GetSoftMaxDuration() *durationpb.Duration {
 	if x != nil {
 		return x.SoftMaxDuration
 	}
@@ -5044,7 +5044,7 @@ func (x *Vehicle_DurationLimit) GetCostPerHourAfterSoftMax() float64 {
 	return 0
 }
 
-func (x *Vehicle_DurationLimit) GetQuadraticSoftMaxDuration() *duration.Duration {
+func (x *Vehicle_DurationLimit) GetQuadraticSoftMaxDuration() *durationpb.Duration {
 	if x != nil {
 		return x.QuadraticSoftMaxDuration
 	}
@@ -5130,11 +5130,11 @@ type BreakRule_BreakRequest struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. Lower bound (inclusive) on the start of the break.
-	EarliestStartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=earliest_start_time,json=earliestStartTime,proto3" json:"earliest_start_time,omitempty"`
+	EarliestStartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=earliest_start_time,json=earliestStartTime,proto3" json:"earliest_start_time,omitempty"`
 	// Required. Upper bound (inclusive) on the start of the break.
-	LatestStartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=latest_start_time,json=latestStartTime,proto3" json:"latest_start_time,omitempty"`
+	LatestStartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=latest_start_time,json=latestStartTime,proto3" json:"latest_start_time,omitempty"`
 	// Required. Minimum duration of the break. Must be positive.
-	MinDuration *duration.Duration `protobuf:"bytes,3,opt,name=min_duration,json=minDuration,proto3" json:"min_duration,omitempty"`
+	MinDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=min_duration,json=minDuration,proto3" json:"min_duration,omitempty"`
 }
 
 func (x *BreakRule_BreakRequest) Reset() {
@@ -5169,21 +5169,21 @@ func (*BreakRule_BreakRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{16, 0}
 }
 
-func (x *BreakRule_BreakRequest) GetEarliestStartTime() *timestamp.Timestamp {
+func (x *BreakRule_BreakRequest) GetEarliestStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EarliestStartTime
 	}
 	return nil
 }
 
-func (x *BreakRule_BreakRequest) GetLatestStartTime() *timestamp.Timestamp {
+func (x *BreakRule_BreakRequest) GetLatestStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LatestStartTime
 	}
 	return nil
 }
 
-func (x *BreakRule_BreakRequest) GetMinDuration() *duration.Duration {
+func (x *BreakRule_BreakRequest) GetMinDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MinDuration
 	}
@@ -5234,11 +5234,11 @@ type BreakRule_FrequencyConstraint struct {
 
 	// Required. Minimum break duration for this constraint. Nonnegative.
 	// See description of `FrequencyConstraint`.
-	MinBreakDuration *duration.Duration `protobuf:"bytes,1,opt,name=min_break_duration,json=minBreakDuration,proto3" json:"min_break_duration,omitempty"`
+	MinBreakDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=min_break_duration,json=minBreakDuration,proto3" json:"min_break_duration,omitempty"`
 	// Required. Maximum allowed span of any interval of time in the route that does not
 	// include at least partially a break of `duration >=
 	// min_break_duration`. Must be positive.
-	MaxInterBreakDuration *duration.Duration `protobuf:"bytes,2,opt,name=max_inter_break_duration,json=maxInterBreakDuration,proto3" json:"max_inter_break_duration,omitempty"`
+	MaxInterBreakDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=max_inter_break_duration,json=maxInterBreakDuration,proto3" json:"max_inter_break_duration,omitempty"`
 }
 
 func (x *BreakRule_FrequencyConstraint) Reset() {
@@ -5273,14 +5273,14 @@ func (*BreakRule_FrequencyConstraint) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{16, 1}
 }
 
-func (x *BreakRule_FrequencyConstraint) GetMinBreakDuration() *duration.Duration {
+func (x *BreakRule_FrequencyConstraint) GetMinBreakDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MinBreakDuration
 	}
 	return nil
 }
 
-func (x *BreakRule_FrequencyConstraint) GetMaxInterBreakDuration() *duration.Duration {
+func (x *BreakRule_FrequencyConstraint) GetMaxInterBreakDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MaxInterBreakDuration
 	}
@@ -5298,9 +5298,9 @@ type ShipmentRoute_Delay struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Start of the delay.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Duration of the delay.
-	Duration *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
 }
 
 func (x *ShipmentRoute_Delay) Reset() {
@@ -5335,14 +5335,14 @@ func (*ShipmentRoute_Delay) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{17, 0}
 }
 
-func (x *ShipmentRoute_Delay) GetStartTime() *timestamp.Timestamp {
+func (x *ShipmentRoute_Delay) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *ShipmentRoute_Delay) GetDuration() *duration.Duration {
+func (x *ShipmentRoute_Delay) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -5367,7 +5367,7 @@ type ShipmentRoute_Visit struct {
 	// Time at which the visit starts. Note that the vehicle may arrive earlier
 	// than this at the visit location. Times are consistent with the
 	// `ShipmentModel`.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Total visit load demand as the sum of the shipment and the visit request
 	// `load_demands`. The values are negative if the visit is a delivery.
 	// Demands are reported for the same types as the
@@ -5389,7 +5389,7 @@ type ShipmentRoute_Visit struct {
 	// start_time - vehicle_start_time - travel duration from
 	// the vehicle's `start_location` to the visit.
 	// ```
-	Detour *duration.Duration `protobuf:"bytes,6,opt,name=detour,proto3" json:"detour,omitempty"`
+	Detour *durationpb.Duration `protobuf:"bytes,6,opt,name=detour,proto3" json:"detour,omitempty"`
 	// Copy of the corresponding `Shipment.label`, if specified in the
 	// `Shipment`.
 	ShipmentLabel string `protobuf:"bytes,7,opt,name=shipment_label,json=shipmentLabel,proto3" json:"shipment_label,omitempty"`
@@ -5470,7 +5470,7 @@ func (x *ShipmentRoute_Visit) GetVisitRequestIndex() int32 {
 	return 0
 }
 
-func (x *ShipmentRoute_Visit) GetStartTime() *timestamp.Timestamp {
+func (x *ShipmentRoute_Visit) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -5484,7 +5484,7 @@ func (x *ShipmentRoute_Visit) GetLoadDemands() map[string]*Shipment_Load {
 	return nil
 }
 
-func (x *ShipmentRoute_Visit) GetDetour() *duration.Duration {
+func (x *ShipmentRoute_Visit) GetDetour() *durationpb.Duration {
 	if x != nil {
 		return x.Detour
 	}
@@ -5540,7 +5540,7 @@ type ShipmentRoute_Transition struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Travel duration during this transition.
-	TravelDuration *duration.Duration `protobuf:"bytes,1,opt,name=travel_duration,json=travelDuration,proto3" json:"travel_duration,omitempty"`
+	TravelDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=travel_duration,json=travelDuration,proto3" json:"travel_duration,omitempty"`
 	// Distance traveled during the transition.
 	TravelDistanceMeters float64 `protobuf:"fixed64,2,opt,name=travel_distance_meters,json=travelDistanceMeters,proto3" json:"travel_distance_meters,omitempty"`
 	// When traffic is requested via
@@ -5554,15 +5554,15 @@ type ShipmentRoute_Transition struct {
 	// starts exactly `delay_duration` seconds before the next event (visit or
 	// vehicle end). See
 	// [TransitionAttributes.delay][google.cloud.optimization.v1.TransitionAttributes.delay].
-	DelayDuration *duration.Duration `protobuf:"bytes,4,opt,name=delay_duration,json=delayDuration,proto3" json:"delay_duration,omitempty"`
+	DelayDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=delay_duration,json=delayDuration,proto3" json:"delay_duration,omitempty"`
 	// Sum of the duration of the breaks occurring during this transition, if
 	// any. Details about each break's start time and duration are stored in
 	// [ShipmentRoute.breaks][google.cloud.optimization.v1.ShipmentRoute.breaks].
-	BreakDuration *duration.Duration `protobuf:"bytes,5,opt,name=break_duration,json=breakDuration,proto3" json:"break_duration,omitempty"`
+	BreakDuration *durationpb.Duration `protobuf:"bytes,5,opt,name=break_duration,json=breakDuration,proto3" json:"break_duration,omitempty"`
 	// Time spent waiting during this transition. Wait duration corresponds to
 	// idle time and does not include break time. Also note that this wait time
 	// may be split into several non-contiguous intervals.
-	WaitDuration *duration.Duration `protobuf:"bytes,6,opt,name=wait_duration,json=waitDuration,proto3" json:"wait_duration,omitempty"`
+	WaitDuration *durationpb.Duration `protobuf:"bytes,6,opt,name=wait_duration,json=waitDuration,proto3" json:"wait_duration,omitempty"`
 	// Total duration of the transition, provided for convenience. It is equal
 	// to:
 	//
@@ -5571,9 +5571,9 @@ type ShipmentRoute_Transition struct {
 	// * if `ShipmentRoute.has_traffic_infeasibilities` is false, the following
 	// additionally holds: `total_duration = travel_duration + delay_duration
 	// + break_duration + wait_duration`.
-	TotalDuration *duration.Duration `protobuf:"bytes,7,opt,name=total_duration,json=totalDuration,proto3" json:"total_duration,omitempty"`
+	TotalDuration *durationpb.Duration `protobuf:"bytes,7,opt,name=total_duration,json=totalDuration,proto3" json:"total_duration,omitempty"`
 	// Start time of this transition.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The encoded polyline representation of the route followed during the
 	// transition.
 	// This field is only populated if [populate_transition_polylines]
@@ -5627,7 +5627,7 @@ func (*ShipmentRoute_Transition) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{17, 2}
 }
 
-func (x *ShipmentRoute_Transition) GetTravelDuration() *duration.Duration {
+func (x *ShipmentRoute_Transition) GetTravelDuration() *durationpb.Duration {
 	if x != nil {
 		return x.TravelDuration
 	}
@@ -5648,35 +5648,35 @@ func (x *ShipmentRoute_Transition) GetTrafficInfoUnavailable() bool {
 	return false
 }
 
-func (x *ShipmentRoute_Transition) GetDelayDuration() *duration.Duration {
+func (x *ShipmentRoute_Transition) GetDelayDuration() *durationpb.Duration {
 	if x != nil {
 		return x.DelayDuration
 	}
 	return nil
 }
 
-func (x *ShipmentRoute_Transition) GetBreakDuration() *duration.Duration {
+func (x *ShipmentRoute_Transition) GetBreakDuration() *durationpb.Duration {
 	if x != nil {
 		return x.BreakDuration
 	}
 	return nil
 }
 
-func (x *ShipmentRoute_Transition) GetWaitDuration() *duration.Duration {
+func (x *ShipmentRoute_Transition) GetWaitDuration() *durationpb.Duration {
 	if x != nil {
 		return x.WaitDuration
 	}
 	return nil
 }
 
-func (x *ShipmentRoute_Transition) GetTotalDuration() *duration.Duration {
+func (x *ShipmentRoute_Transition) GetTotalDuration() *durationpb.Duration {
 	if x != nil {
 		return x.TotalDuration
 	}
 	return nil
 }
 
-func (x *ShipmentRoute_Transition) GetStartTime() *timestamp.Timestamp {
+func (x *ShipmentRoute_Transition) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -5815,9 +5815,9 @@ type ShipmentRoute_Break struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Start time of a break.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Duration of a break.
-	Duration *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
 }
 
 func (x *ShipmentRoute_Break) Reset() {
@@ -5852,14 +5852,14 @@ func (*ShipmentRoute_Break) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{17, 5}
 }
 
-func (x *ShipmentRoute_Break) GetStartTime() *timestamp.Timestamp {
+func (x *ShipmentRoute_Break) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *ShipmentRoute_Break) GetDuration() *duration.Duration {
+func (x *ShipmentRoute_Break) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -5887,7 +5887,7 @@ type ShipmentRoute_TravelStep struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Duration of the travel step.
-	Duration *duration.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
 	// Distance traveled during the step.
 	DistanceMeters float64 `protobuf:"fixed64,2,opt,name=distance_meters,json=distanceMeters,proto3" json:"distance_meters,omitempty"`
 	// When traffic is requested via
@@ -5937,7 +5937,7 @@ func (*ShipmentRoute_TravelStep) Descriptor() ([]byte, []int) {
 	return file_google_cloud_optimization_v1_fleet_routing_proto_rawDescGZIP(), []int{17, 6}
 }
 
-func (x *ShipmentRoute_TravelStep) GetDuration() *duration.Duration {
+func (x *ShipmentRoute_TravelStep) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -6181,7 +6181,7 @@ type InjectedSolutionConstraint_ConstraintRelaxation_Relaxation struct {
 	// satified.
 	Level InjectedSolutionConstraint_ConstraintRelaxation_Relaxation_Level `protobuf:"varint,1,opt,name=level,proto3,enum=google.cloud.optimization.v1.InjectedSolutionConstraint_ConstraintRelaxation_Relaxation_Level" json:"level,omitempty"`
 	// The time at or after which the relaxation `level` may be applied.
-	ThresholdTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=threshold_time,json=thresholdTime,proto3" json:"threshold_time,omitempty"`
+	ThresholdTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=threshold_time,json=thresholdTime,proto3" json:"threshold_time,omitempty"`
 	// The number of visits at or after which the relaxation `level` may be
 	// applied. If `threshold_visit_count` is 0 (or unset), the `level` may be
 	// applied directly at the vehicle start.
@@ -6231,7 +6231,7 @@ func (x *InjectedSolutionConstraint_ConstraintRelaxation_Relaxation) GetLevel()
 	return InjectedSolutionConstraint_ConstraintRelaxation_Relaxation_LEVEL_UNSPECIFIED
 }
 
-func (x *InjectedSolutionConstraint_ConstraintRelaxation_Relaxation) GetThresholdTime() *timestamp.Timestamp {
+func (x *InjectedSolutionConstraint_ConstraintRelaxation_Relaxation) GetThresholdTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ThresholdTime
 	}
@@ -7793,8 +7793,8 @@ var file_google_cloud_optimization_v1_fleet_routing_proto_goTypes = []interface{
 	(*InjectedSolutionConstraint_ConstraintRelaxation)(nil),            // 63: google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation
 	(*InjectedSolutionConstraint_ConstraintRelaxation_Relaxation)(nil), // 64: google.cloud.optimization.v1.InjectedSolutionConstraint.ConstraintRelaxation.Relaxation
 	(*OptimizeToursValidationError_FieldReference)(nil),                // 65: google.cloud.optimization.v1.OptimizeToursValidationError.FieldReference
-	(*duration.Duration)(nil),                                          // 66: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),                                        // 67: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                                        // 66: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                                      // 67: google.protobuf.Timestamp
 	(*latlng.LatLng)(nil),                                              // 68: google.type.LatLng
 	(*InputConfig)(nil),                                                // 69: google.cloud.optimization.v1.InputConfig
 	(*OutputConfig)(nil),                                               // 70: google.cloud.optimization.v1.OutputConfig
diff --git a/optimization/go.mod b/optimization/go.mod
index 47f7a57e2d8..1eb517059b9 100644
--- a/optimization/go.mod
+++ b/optimization/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/optimization
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/optimization/go.sum b/optimization/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/optimization/go.sum
+++ b/optimization/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/orchestration/airflow/service/apiv1/doc.go b/orchestration/airflow/service/apiv1/doc.go
index 466d79f00e7..c5d52773308 100644
--- a/orchestration/airflow/service/apiv1/doc.go
+++ b/orchestration/airflow/service/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &servicepb.CreateEnvironmentRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1#CreateEnvironmentRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb#CreateEnvironmentRequest.
 //	}
 //	op, err := c.CreateEnvironment(ctx, req)
 //	if err != nil {
diff --git a/orchestration/airflow/service/apiv1/environments_client.go b/orchestration/airflow/service/apiv1/environments_client.go
index a53546275b8..fba85a52ae9 100644
--- a/orchestration/airflow/service/apiv1/environments_client.go
+++ b/orchestration/airflow/service/apiv1/environments_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	servicepb "cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	servicepb "google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/orchestration/airflow/service/apiv1/environments_client_example_test.go b/orchestration/airflow/service/apiv1/environments_client_example_test.go
index 45281bb0ea1..0aa6c4e357b 100644
--- a/orchestration/airflow/service/apiv1/environments_client_example_test.go
+++ b/orchestration/airflow/service/apiv1/environments_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	service "cloud.google.com/go/orchestration/airflow/service/apiv1"
+	servicepb "cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb"
 	"google.golang.org/api/iterator"
-	servicepb "google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1"
 )
 
 func ExampleNewEnvironmentsClient() {
@@ -56,7 +56,7 @@ func ExampleEnvironmentsClient_CreateEnvironment() {
 
 	req := &servicepb.CreateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1#CreateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb#CreateEnvironmentRequest.
 	}
 	op, err := c.CreateEnvironment(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleEnvironmentsClient_GetEnvironment() {
 
 	req := &servicepb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
@@ -111,7 +111,7 @@ func ExampleEnvironmentsClient_ListEnvironments() {
 
 	req := &servicepb.ListEnvironmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1#ListEnvironmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb#ListEnvironmentsRequest.
 	}
 	it := c.ListEnvironments(ctx, req)
 	for {
@@ -142,7 +142,7 @@ func ExampleEnvironmentsClient_UpdateEnvironment() {
 
 	req := &servicepb.UpdateEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1#UpdateEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb#UpdateEnvironmentRequest.
 	}
 	op, err := c.UpdateEnvironment(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleEnvironmentsClient_DeleteEnvironment() {
 
 	req := &servicepb.DeleteEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1#DeleteEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb#DeleteEnvironmentRequest.
 	}
 	op, err := c.DeleteEnvironment(ctx, req)
 	if err != nil {
diff --git a/orchestration/airflow/service/apiv1/image_versions_client.go b/orchestration/airflow/service/apiv1/image_versions_client.go
index fbb54ebad04..48d980babdd 100644
--- a/orchestration/airflow/service/apiv1/image_versions_client.go
+++ b/orchestration/airflow/service/apiv1/image_versions_client.go
@@ -22,12 +22,12 @@ import (
 	"math"
 	"net/url"
 
+	servicepb "cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	servicepb "google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/orchestration/airflow/service/apiv1/image_versions_client_example_test.go b/orchestration/airflow/service/apiv1/image_versions_client_example_test.go
index 12f9a9ec4d7..e7a2357e292 100644
--- a/orchestration/airflow/service/apiv1/image_versions_client_example_test.go
+++ b/orchestration/airflow/service/apiv1/image_versions_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	service "cloud.google.com/go/orchestration/airflow/service/apiv1"
+	servicepb "cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb"
 	"google.golang.org/api/iterator"
-	servicepb "google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1"
 )
 
 func ExampleNewImageVersionsClient() {
@@ -56,7 +56,7 @@ func ExampleImageVersionsClient_ListImageVersions() {
 
 	req := &servicepb.ListImageVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orchestration/airflow/service/v1#ListImageVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orchestration/airflow/service/apiv1/servicepb#ListImageVersionsRequest.
 	}
 	it := c.ListImageVersions(ctx, req)
 	for {
diff --git a/orchestration/airflow/service/apiv1/servicepb/environments.pb.go b/orchestration/airflow/service/apiv1/servicepb/environments.pb.go
index 284e292f4de..8789fc1c21f 100644
--- a/orchestration/airflow/service/apiv1/servicepb/environments.pb.go
+++ b/orchestration/airflow/service/apiv1/servicepb/environments.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/orchestration/airflow/service/v1/environments.proto
 
 package servicepb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -582,7 +582,7 @@ type UpdateEnvironmentRequest struct {
 	//     variables  are cleared.
 	//     It is an error to provide both this mask and a mask specifying one or
 	//     more individual environment variables.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateEnvironmentRequest) Reset() {
@@ -631,7 +631,7 @@ func (x *UpdateEnvironmentRequest) GetEnvironment() *Environment {
 	return nil
 }
 
-func (x *UpdateEnvironmentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEnvironmentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1687,9 +1687,9 @@ type Environment struct {
 	// The current state of the environment.
 	State Environment_State `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.orchestration.airflow.service.v1.Environment_State" json:"state,omitempty"`
 	// Output only. The time at which this environment was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this environment was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. User-defined labels for this environment.
 	// The labels map can contain no more than 64 entries. Entries of the labels
 	// map are UTF8 strings that comply with the following restrictions:
@@ -1761,14 +1761,14 @@ func (x *Environment) GetState() Environment_State {
 	return Environment_STATE_UNSPECIFIED
 }
 
-func (x *Environment) GetCreateTime() *timestamp.Timestamp {
+func (x *Environment) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Environment) GetUpdateTime() *timestamp.Timestamp {
+func (x *Environment) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2451,8 +2451,8 @@ var file_google_cloud_orchestration_airflow_service_v1_environments_proto_goType
 	nil,                           // 23: google.cloud.orchestration.airflow.service.v1.SoftwareConfig.EnvVariablesEntry
 	nil,                           // 24: google.cloud.orchestration.airflow.service.v1.Environment.LabelsEntry
 	nil,                           // 25: google.cloud.orchestration.airflow.service.v1.CheckUpgradeResponse.PypiDependenciesEntry
-	(*field_mask.FieldMask)(nil),  // 26: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),   // 27: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil), // 26: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil), // 27: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil), // 28: google.longrunning.Operation
 }
 var file_google_cloud_orchestration_airflow_service_v1_environments_proto_depIdxs = []int32{
diff --git a/orchestration/airflow/service/apiv1/servicepb/image_versions.pb.go b/orchestration/airflow/service/apiv1/servicepb/image_versions.pb.go
index 706b422f393..dafd3953815 100644
--- a/orchestration/airflow/service/apiv1/servicepb/image_versions.pb.go
+++ b/orchestration/airflow/service/apiv1/servicepb/image_versions.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/orchestration/airflow/service/v1/image_versions.proto
 
 package servicepb
diff --git a/orchestration/airflow/service/apiv1/servicepb/operations.pb.go b/orchestration/airflow/service/apiv1/servicepb/operations.pb.go
index 3a2087ac933..418b1101190 100644
--- a/orchestration/airflow/service/apiv1/servicepb/operations.pb.go
+++ b/orchestration/airflow/service/apiv1/servicepb/operations.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/orchestration/airflow/service/v1/operations.proto
 
 package servicepb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -177,10 +177,10 @@ type OperationMetadata struct {
 	// Output only. The UUID of the resource being operated on.
 	ResourceUuid string `protobuf:"bytes,4,opt,name=resource_uuid,json=resourceUuid,proto3" json:"resource_uuid,omitempty"`
 	// Output only. The time the operation was submitted to the server.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the operation terminated, regardless of its success.
 	// This field is unset if the operation is still ongoing.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *OperationMetadata) Reset() {
@@ -243,14 +243,14 @@ func (x *OperationMetadata) GetResourceUuid() string {
 	return ""
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -334,10 +334,10 @@ func file_google_cloud_orchestration_airflow_service_v1_operations_proto_rawDesc
 var file_google_cloud_orchestration_airflow_service_v1_operations_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
 var file_google_cloud_orchestration_airflow_service_v1_operations_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_orchestration_airflow_service_v1_operations_proto_goTypes = []interface{}{
-	(OperationMetadata_State)(0), // 0: google.cloud.orchestration.airflow.service.v1.OperationMetadata.State
-	(OperationMetadata_Type)(0),  // 1: google.cloud.orchestration.airflow.service.v1.OperationMetadata.Type
-	(*OperationMetadata)(nil),    // 2: google.cloud.orchestration.airflow.service.v1.OperationMetadata
-	(*timestamp.Timestamp)(nil),  // 3: google.protobuf.Timestamp
+	(OperationMetadata_State)(0),  // 0: google.cloud.orchestration.airflow.service.v1.OperationMetadata.State
+	(OperationMetadata_Type)(0),   // 1: google.cloud.orchestration.airflow.service.v1.OperationMetadata.Type
+	(*OperationMetadata)(nil),     // 2: google.cloud.orchestration.airflow.service.v1.OperationMetadata
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
 }
 var file_google_cloud_orchestration_airflow_service_v1_operations_proto_depIdxs = []int32{
 	0, // 0: google.cloud.orchestration.airflow.service.v1.OperationMetadata.state:type_name -> google.cloud.orchestration.airflow.service.v1.OperationMetadata.State
diff --git a/orchestration/aliasshim/aliasshim.go b/orchestration/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/orchestration/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/orchestration/go.mod b/orchestration/go.mod
index 6f07ee212cf..ada9c3e4cb8 100644
--- a/orchestration/go.mod
+++ b/orchestration/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/orchestration
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/orchestration/go.sum b/orchestration/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/orchestration/go.sum
+++ b/orchestration/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/orgpolicy/aliasshim/aliasshim.go b/orgpolicy/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/orgpolicy/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/orgpolicy/apiv2/doc.go b/orgpolicy/apiv2/doc.go
index 0bb35264398..d3044cdb8bf 100644
--- a/orgpolicy/apiv2/doc.go
+++ b/orgpolicy/apiv2/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &orgpolicypb.ListConstraintsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orgpolicy/v2#ListConstraintsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/orgpolicy/apiv2/orgpolicypb#ListConstraintsRequest.
 //	}
 //	it := c.ListConstraints(ctx, req)
 //	for {
diff --git a/orgpolicy/apiv2/org_policy_client.go b/orgpolicy/apiv2/org_policy_client.go
index d258d0007c0..8bf5a4343f6 100644
--- a/orgpolicy/apiv2/org_policy_client.go
+++ b/orgpolicy/apiv2/org_policy_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	orgpolicypb "cloud.google.com/go/orgpolicy/apiv2/orgpolicypb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	orgpolicypb "google.golang.org/genproto/googleapis/cloud/orgpolicy/v2"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/orgpolicy/apiv2/org_policy_client_example_test.go b/orgpolicy/apiv2/org_policy_client_example_test.go
index 41158beb6e4..280fa28f9fe 100644
--- a/orgpolicy/apiv2/org_policy_client_example_test.go
+++ b/orgpolicy/apiv2/org_policy_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	orgpolicy "cloud.google.com/go/orgpolicy/apiv2"
+	orgpolicypb "cloud.google.com/go/orgpolicy/apiv2/orgpolicypb"
 	"google.golang.org/api/iterator"
-	orgpolicypb "google.golang.org/genproto/googleapis/cloud/orgpolicy/v2"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListConstraints() {
 
 	req := &orgpolicypb.ListConstraintsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orgpolicy/v2#ListConstraintsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orgpolicy/apiv2/orgpolicypb#ListConstraintsRequest.
 	}
 	it := c.ListConstraints(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_ListPolicies() {
 
 	req := &orgpolicypb.ListPoliciesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orgpolicy/v2#ListPoliciesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orgpolicy/apiv2/orgpolicypb#ListPoliciesRequest.
 	}
 	it := c.ListPolicies(ctx, req)
 	for {
@@ -118,7 +118,7 @@ func ExampleClient_GetPolicy() {
 
 	req := &orgpolicypb.GetPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orgpolicy/v2#GetPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orgpolicy/apiv2/orgpolicypb#GetPolicyRequest.
 	}
 	resp, err := c.GetPolicy(ctx, req)
 	if err != nil {
@@ -143,7 +143,7 @@ func ExampleClient_GetEffectivePolicy() {
 
 	req := &orgpolicypb.GetEffectivePolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orgpolicy/v2#GetEffectivePolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orgpolicy/apiv2/orgpolicypb#GetEffectivePolicyRequest.
 	}
 	resp, err := c.GetEffectivePolicy(ctx, req)
 	if err != nil {
@@ -168,7 +168,7 @@ func ExampleClient_CreatePolicy() {
 
 	req := &orgpolicypb.CreatePolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orgpolicy/v2#CreatePolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orgpolicy/apiv2/orgpolicypb#CreatePolicyRequest.
 	}
 	resp, err := c.CreatePolicy(ctx, req)
 	if err != nil {
@@ -193,7 +193,7 @@ func ExampleClient_UpdatePolicy() {
 
 	req := &orgpolicypb.UpdatePolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orgpolicy/v2#UpdatePolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orgpolicy/apiv2/orgpolicypb#UpdatePolicyRequest.
 	}
 	resp, err := c.UpdatePolicy(ctx, req)
 	if err != nil {
@@ -218,7 +218,7 @@ func ExampleClient_DeletePolicy() {
 
 	req := &orgpolicypb.DeletePolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/orgpolicy/v2#DeletePolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/orgpolicy/apiv2/orgpolicypb#DeletePolicyRequest.
 	}
 	err = c.DeletePolicy(ctx, req)
 	if err != nil {
diff --git a/orgpolicy/apiv2/orgpolicypb/constraint.pb.go b/orgpolicy/apiv2/orgpolicypb/constraint.pb.go
index c3b4ceff3d4..a6ebda4dcdd 100644
--- a/orgpolicy/apiv2/orgpolicypb/constraint.pb.go
+++ b/orgpolicy/apiv2/orgpolicypb/constraint.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/orgpolicy/v2/constraint.proto
 
 package orgpolicypb
diff --git a/orgpolicy/apiv2/orgpolicypb/orgpolicy.pb.go b/orgpolicy/apiv2/orgpolicypb/orgpolicy.pb.go
index 5d3d57b69f8..f70575e16fb 100644
--- a/orgpolicy/apiv2/orgpolicypb/orgpolicy.pb.go
+++ b/orgpolicy/apiv2/orgpolicypb/orgpolicy.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/orgpolicy/v2/orgpolicy.proto
 
 package orgpolicypb
@@ -25,8 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	expr "google.golang.org/genproto/googleapis/type/expr"
 	grpc "google.golang.org/grpc"
@@ -34,6 +32,8 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -208,7 +208,7 @@ type PolicySpec struct {
 	// Output only. The time stamp this was previously updated. This
 	// represents the last time a call to `CreatePolicy` or `UpdatePolicy` was
 	// made for that `Policy`.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Up to 10 PolicyRules are allowed.
 	//
 	// In Policies for boolean constraints, the following requirements apply:
@@ -274,7 +274,7 @@ func (x *PolicySpec) GetEtag() string {
 	return ""
 }
 
-func (x *PolicySpec) GetUpdateTime() *timestamp.Timestamp {
+func (x *PolicySpec) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1367,10 +1367,10 @@ var file_google_cloud_orgpolicy_v2_orgpolicy_proto_goTypes = []interface{}{
 	(*DeletePolicyRequest)(nil),                // 11: google.cloud.orgpolicy.v2.DeletePolicyRequest
 	(*PolicySpec_PolicyRule)(nil),              // 12: google.cloud.orgpolicy.v2.PolicySpec.PolicyRule
 	(*PolicySpec_PolicyRule_StringValues)(nil), // 13: google.cloud.orgpolicy.v2.PolicySpec.PolicyRule.StringValues
-	(*timestamp.Timestamp)(nil),                // 14: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),              // 14: google.protobuf.Timestamp
 	(*Constraint)(nil),                         // 15: google.cloud.orgpolicy.v2.Constraint
 	(*expr.Expr)(nil),                          // 16: google.type.Expr
-	(*empty.Empty)(nil),                        // 17: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                      // 17: google.protobuf.Empty
 }
 var file_google_cloud_orgpolicy_v2_orgpolicy_proto_depIdxs = []int32{
 	2,  // 0: google.cloud.orgpolicy.v2.Policy.spec:type_name -> google.cloud.orgpolicy.v2.PolicySpec
@@ -1657,7 +1657,7 @@ type OrgPolicyClient interface {
 	//
 	// Returns a `google.rpc.Status` with `google.rpc.Code.NOT_FOUND` if the
 	// constraint or Org Policy does not exist.
-	DeletePolicy(ctx context.Context, in *DeletePolicyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeletePolicy(ctx context.Context, in *DeletePolicyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type orgPolicyClient struct {
@@ -1722,8 +1722,8 @@ func (c *orgPolicyClient) UpdatePolicy(ctx context.Context, in *UpdatePolicyRequ
 	return out, nil
 }
 
-func (c *orgPolicyClient) DeletePolicy(ctx context.Context, in *DeletePolicyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *orgPolicyClient) DeletePolicy(ctx context.Context, in *DeletePolicyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.orgpolicy.v2.OrgPolicy/DeletePolicy", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1771,7 +1771,7 @@ type OrgPolicyServer interface {
 	//
 	// Returns a `google.rpc.Status` with `google.rpc.Code.NOT_FOUND` if the
 	// constraint or Org Policy does not exist.
-	DeletePolicy(context.Context, *DeletePolicyRequest) (*empty.Empty, error)
+	DeletePolicy(context.Context, *DeletePolicyRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedOrgPolicyServer can be embedded to have forward compatible implementations.
@@ -1796,7 +1796,7 @@ func (*UnimplementedOrgPolicyServer) CreatePolicy(context.Context, *CreatePolicy
 func (*UnimplementedOrgPolicyServer) UpdatePolicy(context.Context, *UpdatePolicyRequest) (*Policy, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdatePolicy not implemented")
 }
-func (*UnimplementedOrgPolicyServer) DeletePolicy(context.Context, *DeletePolicyRequest) (*empty.Empty, error) {
+func (*UnimplementedOrgPolicyServer) DeletePolicy(context.Context, *DeletePolicyRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletePolicy not implemented")
 }
 
diff --git a/orgpolicy/go.mod b/orgpolicy/go.mod
index c1ee0fd4722..8c8acea440c 100644
--- a/orgpolicy/go.mod
+++ b/orgpolicy/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/orgpolicy
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/orgpolicy/go.sum b/orgpolicy/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/orgpolicy/go.sum
+++ b/orgpolicy/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/osconfig/agentendpoint/apiv1/agent_endpoint_client.go b/osconfig/agentendpoint/apiv1/agent_endpoint_client.go
index c0c0d33b9f9..eefee67cf58 100644
--- a/osconfig/agentendpoint/apiv1/agent_endpoint_client.go
+++ b/osconfig/agentendpoint/apiv1/agent_endpoint_client.go
@@ -21,11 +21,11 @@ import (
 	"math"
 	"time"
 
+	agentendpointpb "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/osconfig/agentendpoint/apiv1/agent_endpoint_client_example_test.go b/osconfig/agentendpoint/apiv1/agent_endpoint_client_example_test.go
index 46d11a3d18c..b3c7f6c62c7 100644
--- a/osconfig/agentendpoint/apiv1/agent_endpoint_client_example_test.go
+++ b/osconfig/agentendpoint/apiv1/agent_endpoint_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	agentendpoint "cloud.google.com/go/osconfig/agentendpoint/apiv1"
-	agentendpointpb "google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1"
+	agentendpointpb "cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb"
 )
 
 func ExampleNewClient() {
@@ -55,7 +55,7 @@ func ExampleClient_StartNextTask() {
 
 	req := &agentendpointpb.StartNextTaskRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1#StartNextTaskRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb#StartNextTaskRequest.
 	}
 	resp, err := c.StartNextTask(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleClient_ReportTaskProgress() {
 
 	req := &agentendpointpb.ReportTaskProgressRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1#ReportTaskProgressRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb#ReportTaskProgressRequest.
 	}
 	resp, err := c.ReportTaskProgress(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleClient_ReportTaskComplete() {
 
 	req := &agentendpointpb.ReportTaskCompleteRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1#ReportTaskCompleteRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb#ReportTaskCompleteRequest.
 	}
 	resp, err := c.ReportTaskComplete(ctx, req)
 	if err != nil {
@@ -130,7 +130,7 @@ func ExampleClient_RegisterAgent() {
 
 	req := &agentendpointpb.RegisterAgentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1#RegisterAgentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb#RegisterAgentRequest.
 	}
 	resp, err := c.RegisterAgent(ctx, req)
 	if err != nil {
@@ -155,7 +155,7 @@ func ExampleClient_ReportInventory() {
 
 	req := &agentendpointpb.ReportInventoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/agentendpoint/v1#ReportInventoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/agentendpoint/apiv1/agentendpointpb#ReportInventoryRequest.
 	}
 	resp, err := c.ReportInventory(ctx, req)
 	if err != nil {
diff --git a/osconfig/agentendpoint/apiv1/agentendpointpb/agentendpoint.pb.go b/osconfig/agentendpoint/apiv1/agentendpointpb/agentendpoint.pb.go
index 60760b3b002..50051544b27 100644
--- a/osconfig/agentendpoint/apiv1/agentendpointpb/agentendpoint.pb.go
+++ b/osconfig/agentendpoint/apiv1/agentendpointpb/agentendpoint.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/agentendpoint/v1/agentendpoint.proto
 
 package agentendpointpb
diff --git a/osconfig/agentendpoint/apiv1/agentendpointpb/config_common.pb.go b/osconfig/agentendpoint/apiv1/agentendpointpb/config_common.pb.go
index a8e871f3fb3..a0b88f27c1d 100644
--- a/osconfig/agentendpoint/apiv1/agentendpointpb/config_common.pb.go
+++ b/osconfig/agentendpoint/apiv1/agentendpointpb/config_common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/agentendpoint/v1/config_common.proto
 
 package agentendpointpb
diff --git a/osconfig/agentendpoint/apiv1/agentendpointpb/inventory.pb.go b/osconfig/agentendpoint/apiv1/agentendpointpb/inventory.pb.go
index 02fc3d34481..2973005d5e8 100644
--- a/osconfig/agentendpoint/apiv1/agentendpointpb/inventory.pb.go
+++ b/osconfig/agentendpoint/apiv1/agentendpointpb/inventory.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/agentendpoint/v1/inventory.proto
 
 package agentendpointpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	date "google.golang.org/genproto/googleapis/type/date"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -601,7 +601,7 @@ type Inventory_WindowsUpdatePackage struct {
 	// The revision number of this update package.
 	RevisionNumber int32 `protobuf:"varint,8,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty"`
 	// The last published date of the update, in (UTC) date and time.
-	LastDeploymentChangeTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=last_deployment_change_time,json=lastDeploymentChangeTime,proto3" json:"last_deployment_change_time,omitempty"`
+	LastDeploymentChangeTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=last_deployment_change_time,json=lastDeploymentChangeTime,proto3" json:"last_deployment_change_time,omitempty"`
 }
 
 func (x *Inventory_WindowsUpdatePackage) Reset() {
@@ -692,7 +692,7 @@ func (x *Inventory_WindowsUpdatePackage) GetRevisionNumber() int32 {
 	return 0
 }
 
-func (x *Inventory_WindowsUpdatePackage) GetLastDeploymentChangeTime() *timestamp.Timestamp {
+func (x *Inventory_WindowsUpdatePackage) GetLastDeploymentChangeTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastDeploymentChangeTime
 	}
@@ -715,7 +715,7 @@ type Inventory_WindowsQuickFixEngineeringPackage struct {
 	// Unique identifier associated with a particular QFE update.
 	HotFixId string `protobuf:"bytes,3,opt,name=hot_fix_id,json=hotFixId,proto3" json:"hot_fix_id,omitempty"`
 	// Date that the QFE update was installed.  Mapped from installed_on field.
-	InstallTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=install_time,json=installTime,proto3" json:"install_time,omitempty"`
+	InstallTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=install_time,json=installTime,proto3" json:"install_time,omitempty"`
 }
 
 func (x *Inventory_WindowsQuickFixEngineeringPackage) Reset() {
@@ -771,7 +771,7 @@ func (x *Inventory_WindowsQuickFixEngineeringPackage) GetHotFixId() string {
 	return ""
 }
 
-func (x *Inventory_WindowsQuickFixEngineeringPackage) GetInstallTime() *timestamp.Timestamp {
+func (x *Inventory_WindowsQuickFixEngineeringPackage) GetInstallTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.InstallTime
 	}
@@ -1147,7 +1147,7 @@ var file_google_cloud_osconfig_agentendpoint_v1_inventory_proto_goTypes = []inte
 	(*Inventory_WindowsQuickFixEngineeringPackage)(nil),          // 6: google.cloud.osconfig.agentendpoint.v1.Inventory.WindowsQuickFixEngineeringPackage
 	(*Inventory_WindowsApplication)(nil),                         // 7: google.cloud.osconfig.agentendpoint.v1.Inventory.WindowsApplication
 	(*Inventory_WindowsUpdatePackage_WindowsUpdateCategory)(nil), // 8: google.cloud.osconfig.agentendpoint.v1.Inventory.WindowsUpdatePackage.WindowsUpdateCategory
-	(*timestamp.Timestamp)(nil),                                  // 9: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                                // 9: google.protobuf.Timestamp
 	(*date.Date)(nil),                                            // 10: google.type.Date
 }
 var file_google_cloud_osconfig_agentendpoint_v1_inventory_proto_depIdxs = []int32{
diff --git a/osconfig/agentendpoint/apiv1/agentendpointpb/os_policy.pb.go b/osconfig/agentendpoint/apiv1/agentendpointpb/os_policy.pb.go
index 71e1d6d282e..56a1d9f4490 100644
--- a/osconfig/agentendpoint/apiv1/agentendpointpb/os_policy.pb.go
+++ b/osconfig/agentendpoint/apiv1/agentendpointpb/os_policy.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/agentendpoint/v1/os_policy.proto
 
 package agentendpointpb
diff --git a/osconfig/agentendpoint/apiv1/agentendpointpb/patch_jobs.pb.go b/osconfig/agentendpoint/apiv1/agentendpointpb/patch_jobs.pb.go
index e06b7f9e642..b5ee363d8c2 100644
--- a/osconfig/agentendpoint/apiv1/agentendpointpb/patch_jobs.pb.go
+++ b/osconfig/agentendpoint/apiv1/agentendpointpb/patch_jobs.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/agentendpoint/v1/patch_jobs.proto
 
 package agentendpointpb
diff --git a/osconfig/agentendpoint/apiv1/agentendpointpb/tasks.pb.go b/osconfig/agentendpoint/apiv1/agentendpointpb/tasks.pb.go
index 247f404b825..e1a788e460b 100644
--- a/osconfig/agentendpoint/apiv1/agentendpointpb/tasks.pb.go
+++ b/osconfig/agentendpoint/apiv1/agentendpointpb/tasks.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/agentendpoint/v1/tasks.proto
 
 package agentendpointpb
diff --git a/osconfig/apiv1/doc.go b/osconfig/apiv1/doc.go
index d04be6f598c..3fe6581daf4 100644
--- a/osconfig/apiv1/doc.go
+++ b/osconfig/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &osconfigpb.ExecutePatchJobRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ExecutePatchJobRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ExecutePatchJobRequest.
 //	}
 //	resp, err := c.ExecutePatchJob(ctx, req)
 //	if err != nil {
diff --git a/osconfig/apiv1/os_config_client.go b/osconfig/apiv1/os_config_client.go
index 82f8f662322..220e376d305 100644
--- a/osconfig/apiv1/os_config_client.go
+++ b/osconfig/apiv1/os_config_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	osconfigpb "cloud.google.com/go/osconfig/apiv1/osconfigpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	osconfigpb "google.golang.org/genproto/googleapis/cloud/osconfig/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/osconfig/apiv1/os_config_client_example_test.go b/osconfig/apiv1/os_config_client_example_test.go
index 213d1d6ffc7..4d3f381a4f4 100644
--- a/osconfig/apiv1/os_config_client_example_test.go
+++ b/osconfig/apiv1/os_config_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	osconfig "cloud.google.com/go/osconfig/apiv1"
+	osconfigpb "cloud.google.com/go/osconfig/apiv1/osconfigpb"
 	"google.golang.org/api/iterator"
-	osconfigpb "google.golang.org/genproto/googleapis/cloud/osconfig/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ExecutePatchJob() {
 
 	req := &osconfigpb.ExecutePatchJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ExecutePatchJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ExecutePatchJobRequest.
 	}
 	resp, err := c.ExecutePatchJob(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_GetPatchJob() {
 
 	req := &osconfigpb.GetPatchJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#GetPatchJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#GetPatchJobRequest.
 	}
 	resp, err := c.GetPatchJob(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleClient_CancelPatchJob() {
 
 	req := &osconfigpb.CancelPatchJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#CancelPatchJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#CancelPatchJobRequest.
 	}
 	resp, err := c.CancelPatchJob(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleClient_ListPatchJobs() {
 
 	req := &osconfigpb.ListPatchJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ListPatchJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ListPatchJobsRequest.
 	}
 	it := c.ListPatchJobs(ctx, req)
 	for {
@@ -162,7 +162,7 @@ func ExampleClient_ListPatchJobInstanceDetails() {
 
 	req := &osconfigpb.ListPatchJobInstanceDetailsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ListPatchJobInstanceDetailsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ListPatchJobInstanceDetailsRequest.
 	}
 	it := c.ListPatchJobInstanceDetails(ctx, req)
 	for {
@@ -193,7 +193,7 @@ func ExampleClient_CreatePatchDeployment() {
 
 	req := &osconfigpb.CreatePatchDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#CreatePatchDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#CreatePatchDeploymentRequest.
 	}
 	resp, err := c.CreatePatchDeployment(ctx, req)
 	if err != nil {
@@ -218,7 +218,7 @@ func ExampleClient_GetPatchDeployment() {
 
 	req := &osconfigpb.GetPatchDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#GetPatchDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#GetPatchDeploymentRequest.
 	}
 	resp, err := c.GetPatchDeployment(ctx, req)
 	if err != nil {
@@ -243,7 +243,7 @@ func ExampleClient_ListPatchDeployments() {
 
 	req := &osconfigpb.ListPatchDeploymentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ListPatchDeploymentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ListPatchDeploymentsRequest.
 	}
 	it := c.ListPatchDeployments(ctx, req)
 	for {
@@ -274,7 +274,7 @@ func ExampleClient_DeletePatchDeployment() {
 
 	req := &osconfigpb.DeletePatchDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#DeletePatchDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#DeletePatchDeploymentRequest.
 	}
 	err = c.DeletePatchDeployment(ctx, req)
 	if err != nil {
@@ -297,7 +297,7 @@ func ExampleClient_UpdatePatchDeployment() {
 
 	req := &osconfigpb.UpdatePatchDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#UpdatePatchDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#UpdatePatchDeploymentRequest.
 	}
 	resp, err := c.UpdatePatchDeployment(ctx, req)
 	if err != nil {
@@ -322,7 +322,7 @@ func ExampleClient_PausePatchDeployment() {
 
 	req := &osconfigpb.PausePatchDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#PausePatchDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#PausePatchDeploymentRequest.
 	}
 	resp, err := c.PausePatchDeployment(ctx, req)
 	if err != nil {
@@ -347,7 +347,7 @@ func ExampleClient_ResumePatchDeployment() {
 
 	req := &osconfigpb.ResumePatchDeploymentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ResumePatchDeploymentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ResumePatchDeploymentRequest.
 	}
 	resp, err := c.ResumePatchDeployment(ctx, req)
 	if err != nil {
diff --git a/osconfig/apiv1/os_config_zonal_client.go b/osconfig/apiv1/os_config_zonal_client.go
index 06913b391c9..e33f8e4ef21 100644
--- a/osconfig/apiv1/os_config_zonal_client.go
+++ b/osconfig/apiv1/os_config_zonal_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	osconfigpb "cloud.google.com/go/osconfig/apiv1/osconfigpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	osconfigpb "google.golang.org/genproto/googleapis/cloud/osconfig/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/osconfig/apiv1/os_config_zonal_client_example_test.go b/osconfig/apiv1/os_config_zonal_client_example_test.go
index 19057231525..481663048da 100644
--- a/osconfig/apiv1/os_config_zonal_client_example_test.go
+++ b/osconfig/apiv1/os_config_zonal_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	osconfig "cloud.google.com/go/osconfig/apiv1"
+	osconfigpb "cloud.google.com/go/osconfig/apiv1/osconfigpb"
 	"google.golang.org/api/iterator"
-	osconfigpb "google.golang.org/genproto/googleapis/cloud/osconfig/v1"
 )
 
 func ExampleNewOsConfigZonalClient() {
@@ -56,7 +56,7 @@ func ExampleOsConfigZonalClient_CreateOSPolicyAssignment() {
 
 	req := &osconfigpb.CreateOSPolicyAssignmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#CreateOSPolicyAssignmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#CreateOSPolicyAssignmentRequest.
 	}
 	op, err := c.CreateOSPolicyAssignment(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleOsConfigZonalClient_UpdateOSPolicyAssignment() {
 
 	req := &osconfigpb.UpdateOSPolicyAssignmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#UpdateOSPolicyAssignmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#UpdateOSPolicyAssignmentRequest.
 	}
 	op, err := c.UpdateOSPolicyAssignment(ctx, req)
 	if err != nil {
@@ -116,7 +116,7 @@ func ExampleOsConfigZonalClient_GetOSPolicyAssignment() {
 
 	req := &osconfigpb.GetOSPolicyAssignmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#GetOSPolicyAssignmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#GetOSPolicyAssignmentRequest.
 	}
 	resp, err := c.GetOSPolicyAssignment(ctx, req)
 	if err != nil {
@@ -141,7 +141,7 @@ func ExampleOsConfigZonalClient_ListOSPolicyAssignments() {
 
 	req := &osconfigpb.ListOSPolicyAssignmentsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ListOSPolicyAssignmentsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ListOSPolicyAssignmentsRequest.
 	}
 	it := c.ListOSPolicyAssignments(ctx, req)
 	for {
@@ -172,7 +172,7 @@ func ExampleOsConfigZonalClient_ListOSPolicyAssignmentRevisions() {
 
 	req := &osconfigpb.ListOSPolicyAssignmentRevisionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ListOSPolicyAssignmentRevisionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ListOSPolicyAssignmentRevisionsRequest.
 	}
 	it := c.ListOSPolicyAssignmentRevisions(ctx, req)
 	for {
@@ -203,7 +203,7 @@ func ExampleOsConfigZonalClient_DeleteOSPolicyAssignment() {
 
 	req := &osconfigpb.DeleteOSPolicyAssignmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#DeleteOSPolicyAssignmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#DeleteOSPolicyAssignmentRequest.
 	}
 	op, err := c.DeleteOSPolicyAssignment(ctx, req)
 	if err != nil {
@@ -231,7 +231,7 @@ func ExampleOsConfigZonalClient_GetOSPolicyAssignmentReport() {
 
 	req := &osconfigpb.GetOSPolicyAssignmentReportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#GetOSPolicyAssignmentReportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#GetOSPolicyAssignmentReportRequest.
 	}
 	resp, err := c.GetOSPolicyAssignmentReport(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleOsConfigZonalClient_ListOSPolicyAssignmentReports() {
 
 	req := &osconfigpb.ListOSPolicyAssignmentReportsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ListOSPolicyAssignmentReportsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ListOSPolicyAssignmentReportsRequest.
 	}
 	it := c.ListOSPolicyAssignmentReports(ctx, req)
 	for {
@@ -287,7 +287,7 @@ func ExampleOsConfigZonalClient_GetInventory() {
 
 	req := &osconfigpb.GetInventoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#GetInventoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#GetInventoryRequest.
 	}
 	resp, err := c.GetInventory(ctx, req)
 	if err != nil {
@@ -312,7 +312,7 @@ func ExampleOsConfigZonalClient_ListInventories() {
 
 	req := &osconfigpb.ListInventoriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ListInventoriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ListInventoriesRequest.
 	}
 	it := c.ListInventories(ctx, req)
 	for {
@@ -343,7 +343,7 @@ func ExampleOsConfigZonalClient_GetVulnerabilityReport() {
 
 	req := &osconfigpb.GetVulnerabilityReportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#GetVulnerabilityReportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#GetVulnerabilityReportRequest.
 	}
 	resp, err := c.GetVulnerabilityReport(ctx, req)
 	if err != nil {
@@ -368,7 +368,7 @@ func ExampleOsConfigZonalClient_ListVulnerabilityReports() {
 
 	req := &osconfigpb.ListVulnerabilityReportsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/osconfig/v1#ListVulnerabilityReportsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/osconfig/apiv1/osconfigpb#ListVulnerabilityReportsRequest.
 	}
 	it := c.ListVulnerabilityReports(ctx, req)
 	for {
diff --git a/osconfig/apiv1/osconfigpb/inventory.pb.go b/osconfig/apiv1/osconfigpb/inventory.pb.go
index 973e1b2a7f3..9f9f5085082 100644
--- a/osconfig/apiv1/osconfigpb/inventory.pb.go
+++ b/osconfig/apiv1/osconfigpb/inventory.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/inventory.proto
 
 package osconfigpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	date "google.golang.org/genproto/googleapis/type/date"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -220,7 +220,7 @@ type Inventory struct {
 	// version.
 	Items map[string]*Inventory_Item `protobuf:"bytes,2,rep,name=items,proto3" json:"items,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. Timestamp of the last reported inventory for the VM.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Inventory) Reset() {
@@ -276,7 +276,7 @@ func (x *Inventory) GetItems() map[string]*Inventory_Item {
 	return nil
 }
 
-func (x *Inventory) GetUpdateTime() *timestamp.Timestamp {
+func (x *Inventory) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -628,9 +628,9 @@ type Inventory_Item struct {
 	// The origin of this inventory item.
 	OriginType Inventory_Item_OriginType `protobuf:"varint,2,opt,name=origin_type,json=originType,proto3,enum=google.cloud.osconfig.v1.Inventory_Item_OriginType" json:"origin_type,omitempty"`
 	// When this inventory item was first detected.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// When this inventory item was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The specific type of inventory, correlating to its specific details.
 	Type Inventory_Item_Type `protobuf:"varint,5,opt,name=type,proto3,enum=google.cloud.osconfig.v1.Inventory_Item_Type" json:"type,omitempty"`
 	// Specific details of this inventory item based on its type.
@@ -688,14 +688,14 @@ func (x *Inventory_Item) GetOriginType() Inventory_Item_OriginType {
 	return Inventory_Item_ORIGIN_TYPE_UNSPECIFIED
 }
 
-func (x *Inventory_Item) GetCreateTime() *timestamp.Timestamp {
+func (x *Inventory_Item) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Inventory_Item) GetUpdateTime() *timestamp.Timestamp {
+func (x *Inventory_Item) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1129,7 +1129,7 @@ type Inventory_WindowsUpdatePackage struct {
 	// The revision number of this update package.
 	RevisionNumber int32 `protobuf:"varint,7,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty"`
 	// The last published date of the update, in (UTC) date and time.
-	LastDeploymentChangeTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=last_deployment_change_time,json=lastDeploymentChangeTime,proto3" json:"last_deployment_change_time,omitempty"`
+	LastDeploymentChangeTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=last_deployment_change_time,json=lastDeploymentChangeTime,proto3" json:"last_deployment_change_time,omitempty"`
 }
 
 func (x *Inventory_WindowsUpdatePackage) Reset() {
@@ -1220,7 +1220,7 @@ func (x *Inventory_WindowsUpdatePackage) GetRevisionNumber() int32 {
 	return 0
 }
 
-func (x *Inventory_WindowsUpdatePackage) GetLastDeploymentChangeTime() *timestamp.Timestamp {
+func (x *Inventory_WindowsUpdatePackage) GetLastDeploymentChangeTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastDeploymentChangeTime
 	}
@@ -1243,7 +1243,7 @@ type Inventory_WindowsQuickFixEngineeringPackage struct {
 	// Unique identifier associated with a particular QFE update.
 	HotFixId string `protobuf:"bytes,3,opt,name=hot_fix_id,json=hotFixId,proto3" json:"hot_fix_id,omitempty"`
 	// Date that the QFE update was installed.  Mapped from installed_on field.
-	InstallTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=install_time,json=installTime,proto3" json:"install_time,omitempty"`
+	InstallTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=install_time,json=installTime,proto3" json:"install_time,omitempty"`
 }
 
 func (x *Inventory_WindowsQuickFixEngineeringPackage) Reset() {
@@ -1299,7 +1299,7 @@ func (x *Inventory_WindowsQuickFixEngineeringPackage) GetHotFixId() string {
 	return ""
 }
 
-func (x *Inventory_WindowsQuickFixEngineeringPackage) GetInstallTime() *timestamp.Timestamp {
+func (x *Inventory_WindowsQuickFixEngineeringPackage) GetInstallTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.InstallTime
 	}
@@ -1768,7 +1768,7 @@ var file_google_cloud_osconfig_v1_inventory_proto_goTypes = []interface{}{
 	(*Inventory_WindowsApplication)(nil),                         // 14: google.cloud.osconfig.v1.Inventory.WindowsApplication
 	nil,                                                          // 15: google.cloud.osconfig.v1.Inventory.ItemsEntry
 	(*Inventory_WindowsUpdatePackage_WindowsUpdateCategory)(nil), // 16: google.cloud.osconfig.v1.Inventory.WindowsUpdatePackage.WindowsUpdateCategory
-	(*timestamp.Timestamp)(nil),                                  // 17: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                                // 17: google.protobuf.Timestamp
 	(*date.Date)(nil),                                            // 18: google.type.Date
 }
 var file_google_cloud_osconfig_v1_inventory_proto_depIdxs = []int32{
diff --git a/osconfig/apiv1/osconfigpb/os_policy.pb.go b/osconfig/apiv1/osconfigpb/os_policy.pb.go
index db0d5c0e2b1..22c228fcf84 100644
--- a/osconfig/apiv1/osconfigpb/os_policy.pb.go
+++ b/osconfig/apiv1/osconfigpb/os_policy.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/os_policy.proto
 
 package osconfigpb
diff --git a/osconfig/apiv1/osconfigpb/os_policy_assignment_reports.pb.go b/osconfig/apiv1/osconfigpb/os_policy_assignment_reports.pb.go
index 969f23dce06..32d62c380e8 100644
--- a/osconfig/apiv1/osconfigpb/os_policy_assignment_reports.pb.go
+++ b/osconfig/apiv1/osconfigpb/os_policy_assignment_reports.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/os_policy_assignment_reports.proto
 
 package osconfigpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -466,7 +466,7 @@ type OSPolicyAssignmentReport struct {
 	// Compliance data for each `OSPolicy` that is applied to the VM.
 	OsPolicyCompliances []*OSPolicyAssignmentReport_OSPolicyCompliance `protobuf:"bytes,4,rep,name=os_policy_compliances,json=osPolicyCompliances,proto3" json:"os_policy_compliances,omitempty"`
 	// Timestamp for when the report was last generated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Unique identifier of the last attempted run to apply the OS policies
 	// associated with this assignment on the VM.
 	//
@@ -537,7 +537,7 @@ func (x *OSPolicyAssignmentReport) GetOsPolicyCompliances() []*OSPolicyAssignmen
 	return nil
 }
 
-func (x *OSPolicyAssignmentReport) GetUpdateTime() *timestamp.Timestamp {
+func (x *OSPolicyAssignmentReport) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1115,7 +1115,7 @@ var file_google_cloud_osconfig_v1_os_policy_assignment_reports_proto_goTypes = [
 	(*OSPolicyAssignmentReport_OSPolicyCompliance_OSPolicyResourceCompliance)(nil),                              // 8: google.cloud.osconfig.v1.OSPolicyAssignmentReport.OSPolicyCompliance.OSPolicyResourceCompliance
 	(*OSPolicyAssignmentReport_OSPolicyCompliance_OSPolicyResourceCompliance_OSPolicyResourceConfigStep)(nil),   // 9: google.cloud.osconfig.v1.OSPolicyAssignmentReport.OSPolicyCompliance.OSPolicyResourceCompliance.OSPolicyResourceConfigStep
 	(*OSPolicyAssignmentReport_OSPolicyCompliance_OSPolicyResourceCompliance_ExecResourceOutput)(nil),           // 10: google.cloud.osconfig.v1.OSPolicyAssignmentReport.OSPolicyCompliance.OSPolicyResourceCompliance.ExecResourceOutput
-	(*timestamp.Timestamp)(nil),                                                                                 // 11: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                                                                               // 11: google.protobuf.Timestamp
 }
 var file_google_cloud_osconfig_v1_os_policy_assignment_reports_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.osconfig.v1.ListOSPolicyAssignmentReportsResponse.os_policy_assignment_reports:type_name -> google.cloud.osconfig.v1.OSPolicyAssignmentReport
diff --git a/osconfig/apiv1/osconfigpb/os_policy_assignments.pb.go b/osconfig/apiv1/osconfigpb/os_policy_assignments.pb.go
index cd29d96fbd0..6170718d71e 100644
--- a/osconfig/apiv1/osconfigpb/os_policy_assignments.pb.go
+++ b/osconfig/apiv1/osconfigpb/os_policy_assignments.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/os_policy_assignments.proto
 
 package osconfigpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -263,7 +263,7 @@ type OSPolicyAssignment struct {
 	// assignment
 	RevisionId string `protobuf:"bytes,6,opt,name=revision_id,json=revisionId,proto3" json:"revision_id,omitempty"`
 	// Output only. The timestamp that the revision was created.
-	RevisionCreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=revision_create_time,json=revisionCreateTime,proto3" json:"revision_create_time,omitempty"`
+	RevisionCreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=revision_create_time,json=revisionCreateTime,proto3" json:"revision_create_time,omitempty"`
 	// The etag for this OS policy assignment.
 	// If this is provided on update, it must match the server's etag.
 	Etag string `protobuf:"bytes,8,opt,name=etag,proto3" json:"etag,omitempty"`
@@ -361,7 +361,7 @@ func (x *OSPolicyAssignment) GetRevisionId() string {
 	return ""
 }
 
-func (x *OSPolicyAssignment) GetRevisionCreateTime() *timestamp.Timestamp {
+func (x *OSPolicyAssignment) GetRevisionCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RevisionCreateTime
 	}
@@ -427,9 +427,9 @@ type OSPolicyAssignmentOperationMetadata struct {
 	// State of the rollout
 	RolloutState OSPolicyAssignmentOperationMetadata_RolloutState `protobuf:"varint,3,opt,name=rollout_state,json=rolloutState,proto3,enum=google.cloud.osconfig.v1.OSPolicyAssignmentOperationMetadata_RolloutState" json:"rollout_state,omitempty"`
 	// Rollout start time
-	RolloutStartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=rollout_start_time,json=rolloutStartTime,proto3" json:"rollout_start_time,omitempty"`
+	RolloutStartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=rollout_start_time,json=rolloutStartTime,proto3" json:"rollout_start_time,omitempty"`
 	// Rollout update time
-	RolloutUpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=rollout_update_time,json=rolloutUpdateTime,proto3" json:"rollout_update_time,omitempty"`
+	RolloutUpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=rollout_update_time,json=rolloutUpdateTime,proto3" json:"rollout_update_time,omitempty"`
 }
 
 func (x *OSPolicyAssignmentOperationMetadata) Reset() {
@@ -485,14 +485,14 @@ func (x *OSPolicyAssignmentOperationMetadata) GetRolloutState() OSPolicyAssignme
 	return OSPolicyAssignmentOperationMetadata_ROLLOUT_STATE_UNSPECIFIED
 }
 
-func (x *OSPolicyAssignmentOperationMetadata) GetRolloutStartTime() *timestamp.Timestamp {
+func (x *OSPolicyAssignmentOperationMetadata) GetRolloutStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RolloutStartTime
 	}
 	return nil
 }
 
-func (x *OSPolicyAssignmentOperationMetadata) GetRolloutUpdateTime() *timestamp.Timestamp {
+func (x *OSPolicyAssignmentOperationMetadata) GetRolloutUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RolloutUpdateTime
 	}
@@ -584,7 +584,7 @@ type UpdateOSPolicyAssignmentRequest struct {
 	OsPolicyAssignment *OSPolicyAssignment `protobuf:"bytes,1,opt,name=os_policy_assignment,json=osPolicyAssignment,proto3" json:"os_policy_assignment,omitempty"`
 	// Optional. Field mask that controls which fields of the assignment should be
 	// updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateOSPolicyAssignmentRequest) Reset() {
@@ -626,7 +626,7 @@ func (x *UpdateOSPolicyAssignmentRequest) GetOsPolicyAssignment() *OSPolicyAssig
 	return nil
 }
 
-func (x *UpdateOSPolicyAssignmentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateOSPolicyAssignmentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1152,7 +1152,7 @@ type OSPolicyAssignment_Rollout struct {
 	// VM continues to count towards the `disruption_budget` at least
 	// until this duration of time has passed after configuration changes are
 	// applied.
-	MinWaitDuration *duration.Duration `protobuf:"bytes,2,opt,name=min_wait_duration,json=minWaitDuration,proto3" json:"min_wait_duration,omitempty"`
+	MinWaitDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=min_wait_duration,json=minWaitDuration,proto3" json:"min_wait_duration,omitempty"`
 }
 
 func (x *OSPolicyAssignment_Rollout) Reset() {
@@ -1194,7 +1194,7 @@ func (x *OSPolicyAssignment_Rollout) GetDisruptionBudget() *FixedOrPercent {
 	return nil
 }
 
-func (x *OSPolicyAssignment_Rollout) GetMinWaitDuration() *duration.Duration {
+func (x *OSPolicyAssignment_Rollout) GetMinWaitDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MinWaitDuration
 	}
@@ -1575,10 +1575,10 @@ var file_google_cloud_osconfig_v1_os_policy_assignments_proto_goTypes = []interf
 	nil,                                                   // 16: google.cloud.osconfig.v1.OSPolicyAssignment.LabelSet.LabelsEntry
 	(*OSPolicyAssignment_InstanceFilter_Inventory)(nil),   // 17: google.cloud.osconfig.v1.OSPolicyAssignment.InstanceFilter.Inventory
 	(*OSPolicy)(nil),                                      // 18: google.cloud.osconfig.v1.OSPolicy
-	(*timestamp.Timestamp)(nil),                           // 19: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                          // 20: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),                         // 19: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                         // 20: google.protobuf.FieldMask
 	(*FixedOrPercent)(nil),                                // 21: google.cloud.osconfig.v1.FixedOrPercent
-	(*duration.Duration)(nil),                             // 22: google.protobuf.Duration
+	(*durationpb.Duration)(nil),                           // 22: google.protobuf.Duration
 }
 var file_google_cloud_osconfig_v1_os_policy_assignments_proto_depIdxs = []int32{
 	18, // 0: google.cloud.osconfig.v1.OSPolicyAssignment.os_policies:type_name -> google.cloud.osconfig.v1.OSPolicy
diff --git a/osconfig/apiv1/osconfigpb/osconfig_common.pb.go b/osconfig/apiv1/osconfigpb/osconfig_common.pb.go
index 6308249adc4..3868a00d0a7 100644
--- a/osconfig/apiv1/osconfigpb/osconfig_common.pb.go
+++ b/osconfig/apiv1/osconfigpb/osconfig_common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/osconfig_common.proto
 
 package osconfigpb
diff --git a/osconfig/apiv1/osconfigpb/osconfig_service.pb.go b/osconfig/apiv1/osconfigpb/osconfig_service.pb.go
index bac2a65cfec..b3d0367360b 100644
--- a/osconfig/apiv1/osconfigpb/osconfig_service.pb.go
+++ b/osconfig/apiv1/osconfigpb/osconfig_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/osconfig_service.proto
 
 package osconfigpb
@@ -24,13 +24,13 @@ import (
 	context "context"
 	reflect "reflect"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -250,7 +250,7 @@ var file_google_cloud_osconfig_v1_osconfig_service_proto_goTypes = []interface{}
 	(*ListPatchJobInstanceDetailsResponse)(nil), // 14: google.cloud.osconfig.v1.ListPatchJobInstanceDetailsResponse
 	(*PatchDeployment)(nil),                     // 15: google.cloud.osconfig.v1.PatchDeployment
 	(*ListPatchDeploymentsResponse)(nil),        // 16: google.cloud.osconfig.v1.ListPatchDeploymentsResponse
-	(*empty.Empty)(nil),                         // 17: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                       // 17: google.protobuf.Empty
 }
 var file_google_cloud_osconfig_v1_osconfig_service_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.osconfig.v1.OsConfigService.ExecutePatchJob:input_type -> google.cloud.osconfig.v1.ExecutePatchJobRequest
@@ -341,7 +341,7 @@ type OsConfigServiceClient interface {
 	// Get a page of OS Config patch deployments.
 	ListPatchDeployments(ctx context.Context, in *ListPatchDeploymentsRequest, opts ...grpc.CallOption) (*ListPatchDeploymentsResponse, error)
 	// Delete an OS Config patch deployment.
-	DeletePatchDeployment(ctx context.Context, in *DeletePatchDeploymentRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeletePatchDeployment(ctx context.Context, in *DeletePatchDeploymentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Update an OS Config patch deployment.
 	UpdatePatchDeployment(ctx context.Context, in *UpdatePatchDeploymentRequest, opts ...grpc.CallOption) (*PatchDeployment, error)
 	// Change state of patch deployment to "PAUSED".
@@ -432,8 +432,8 @@ func (c *osConfigServiceClient) ListPatchDeployments(ctx context.Context, in *Li
 	return out, nil
 }
 
-func (c *osConfigServiceClient) DeletePatchDeployment(ctx context.Context, in *DeletePatchDeploymentRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *osConfigServiceClient) DeletePatchDeployment(ctx context.Context, in *DeletePatchDeploymentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.osconfig.v1.OsConfigService/DeletePatchDeployment", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -489,7 +489,7 @@ type OsConfigServiceServer interface {
 	// Get a page of OS Config patch deployments.
 	ListPatchDeployments(context.Context, *ListPatchDeploymentsRequest) (*ListPatchDeploymentsResponse, error)
 	// Delete an OS Config patch deployment.
-	DeletePatchDeployment(context.Context, *DeletePatchDeploymentRequest) (*empty.Empty, error)
+	DeletePatchDeployment(context.Context, *DeletePatchDeploymentRequest) (*emptypb.Empty, error)
 	// Update an OS Config patch deployment.
 	UpdatePatchDeployment(context.Context, *UpdatePatchDeploymentRequest) (*PatchDeployment, error)
 	// Change state of patch deployment to "PAUSED".
@@ -528,7 +528,7 @@ func (*UnimplementedOsConfigServiceServer) GetPatchDeployment(context.Context, *
 func (*UnimplementedOsConfigServiceServer) ListPatchDeployments(context.Context, *ListPatchDeploymentsRequest) (*ListPatchDeploymentsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListPatchDeployments not implemented")
 }
-func (*UnimplementedOsConfigServiceServer) DeletePatchDeployment(context.Context, *DeletePatchDeploymentRequest) (*empty.Empty, error) {
+func (*UnimplementedOsConfigServiceServer) DeletePatchDeployment(context.Context, *DeletePatchDeploymentRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletePatchDeployment not implemented")
 }
 func (*UnimplementedOsConfigServiceServer) UpdatePatchDeployment(context.Context, *UpdatePatchDeploymentRequest) (*PatchDeployment, error) {
diff --git a/osconfig/apiv1/osconfigpb/osconfig_zonal_service.pb.go b/osconfig/apiv1/osconfigpb/osconfig_zonal_service.pb.go
index 36f7087f2de..f58cf1ed3c1 100644
--- a/osconfig/apiv1/osconfigpb/osconfig_zonal_service.pb.go
+++ b/osconfig/apiv1/osconfigpb/osconfig_zonal_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/osconfig_zonal_service.proto
 
 package osconfigpb
diff --git a/osconfig/apiv1/osconfigpb/patch_deployments.pb.go b/osconfig/apiv1/osconfigpb/patch_deployments.pb.go
index b4e8a493ef9..ac7853fc1c0 100644
--- a/osconfig/apiv1/osconfigpb/patch_deployments.pb.go
+++ b/osconfig/apiv1/osconfigpb/patch_deployments.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/patch_deployments.proto
 
 package osconfigpb
@@ -24,15 +24,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	datetime "google.golang.org/genproto/googleapis/type/datetime"
 	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"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -180,7 +180,7 @@ type PatchDeployment struct {
 	PatchConfig *PatchConfig `protobuf:"bytes,4,opt,name=patch_config,json=patchConfig,proto3" json:"patch_config,omitempty"`
 	// Optional. Duration of the patch. After the duration ends, the patch times
 	// out.
-	Duration *duration.Duration `protobuf:"bytes,5,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,5,opt,name=duration,proto3" json:"duration,omitempty"`
 	// Schedule for the patch.
 	//
 	// Types that are assignable to Schedule:
@@ -190,14 +190,14 @@ type PatchDeployment struct {
 	Schedule isPatchDeployment_Schedule `protobuf_oneof:"schedule"`
 	// Output only. Time the patch deployment was created. Timestamp is in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time the patch deployment was last updated. Timestamp is in
 	// [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The last time a patch job was started by this deployment.
 	// Timestamp is in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text
 	// format.
-	LastExecuteTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=last_execute_time,json=lastExecuteTime,proto3" json:"last_execute_time,omitempty"`
+	LastExecuteTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=last_execute_time,json=lastExecuteTime,proto3" json:"last_execute_time,omitempty"`
 	// Optional. Rollout strategy of the patch job.
 	Rollout *PatchRollout `protobuf:"bytes,11,opt,name=rollout,proto3" json:"rollout,omitempty"`
 	// Output only. Current state of the patch deployment.
@@ -264,7 +264,7 @@ func (x *PatchDeployment) GetPatchConfig() *PatchConfig {
 	return nil
 }
 
-func (x *PatchDeployment) GetDuration() *duration.Duration {
+func (x *PatchDeployment) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -292,21 +292,21 @@ func (x *PatchDeployment) GetRecurringSchedule() *RecurringSchedule {
 	return nil
 }
 
-func (x *PatchDeployment) GetCreateTime() *timestamp.Timestamp {
+func (x *PatchDeployment) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *PatchDeployment) GetUpdateTime() *timestamp.Timestamp {
+func (x *PatchDeployment) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *PatchDeployment) GetLastExecuteTime() *timestamp.Timestamp {
+func (x *PatchDeployment) GetLastExecuteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastExecuteTime
 	}
@@ -353,7 +353,7 @@ type OneTimeSchedule struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Required. The desired patch job execution time.
-	ExecuteTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=execute_time,json=executeTime,proto3" json:"execute_time,omitempty"`
+	ExecuteTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=execute_time,json=executeTime,proto3" json:"execute_time,omitempty"`
 }
 
 func (x *OneTimeSchedule) Reset() {
@@ -388,7 +388,7 @@ func (*OneTimeSchedule) Descriptor() ([]byte, []int) {
 	return file_google_cloud_osconfig_v1_patch_deployments_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *OneTimeSchedule) GetExecuteTime() *timestamp.Timestamp {
+func (x *OneTimeSchedule) GetExecuteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExecuteTime
 	}
@@ -406,10 +406,10 @@ type RecurringSchedule struct {
 	TimeZone *datetime.TimeZone `protobuf:"bytes,1,opt,name=time_zone,json=timeZone,proto3" json:"time_zone,omitempty"`
 	// Optional. The time that the recurring schedule becomes effective.
 	// Defaults to `create_time` of the patch deployment.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Optional. The end time at which a recurring patch deployment schedule is no
 	// longer active.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Required. Time of the day to run a recurring deployment.
 	TimeOfDay *timeofday.TimeOfDay `protobuf:"bytes,4,opt,name=time_of_day,json=timeOfDay,proto3" json:"time_of_day,omitempty"`
 	// Required. The frequency unit of this recurring schedule.
@@ -423,9 +423,9 @@ type RecurringSchedule struct {
 	//	*RecurringSchedule_Monthly
 	ScheduleConfig isRecurringSchedule_ScheduleConfig `protobuf_oneof:"schedule_config"`
 	// Output only. The time the last patch job ran successfully.
-	LastExecuteTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=last_execute_time,json=lastExecuteTime,proto3" json:"last_execute_time,omitempty"`
+	LastExecuteTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=last_execute_time,json=lastExecuteTime,proto3" json:"last_execute_time,omitempty"`
 	// Output only. The time the next patch job is scheduled to run.
-	NextExecuteTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=next_execute_time,json=nextExecuteTime,proto3" json:"next_execute_time,omitempty"`
+	NextExecuteTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=next_execute_time,json=nextExecuteTime,proto3" json:"next_execute_time,omitempty"`
 }
 
 func (x *RecurringSchedule) Reset() {
@@ -467,14 +467,14 @@ func (x *RecurringSchedule) GetTimeZone() *datetime.TimeZone {
 	return nil
 }
 
-func (x *RecurringSchedule) GetStartTime() *timestamp.Timestamp {
+func (x *RecurringSchedule) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *RecurringSchedule) GetEndTime() *timestamp.Timestamp {
+func (x *RecurringSchedule) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -516,14 +516,14 @@ func (x *RecurringSchedule) GetMonthly() *MonthlySchedule {
 	return nil
 }
 
-func (x *RecurringSchedule) GetLastExecuteTime() *timestamp.Timestamp {
+func (x *RecurringSchedule) GetLastExecuteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastExecuteTime
 	}
 	return nil
 }
 
-func (x *RecurringSchedule) GetNextExecuteTime() *timestamp.Timestamp {
+func (x *RecurringSchedule) GetNextExecuteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NextExecuteTime
 	}
@@ -1074,7 +1074,7 @@ type UpdatePatchDeploymentRequest struct {
 	PatchDeployment *PatchDeployment `protobuf:"bytes,1,opt,name=patch_deployment,json=patchDeployment,proto3" json:"patch_deployment,omitempty"`
 	// Optional. Field mask that controls which fields of the patch deployment
 	// should be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdatePatchDeploymentRequest) Reset() {
@@ -1116,7 +1116,7 @@ func (x *UpdatePatchDeploymentRequest) GetPatchDeployment() *PatchDeployment {
 	return nil
 }
 
-func (x *UpdatePatchDeploymentRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdatePatchDeploymentRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1513,13 +1513,13 @@ var file_google_cloud_osconfig_v1_patch_deployments_proto_goTypes = []interface{
 	(*ResumePatchDeploymentRequest)(nil), // 15: google.cloud.osconfig.v1.ResumePatchDeploymentRequest
 	(*PatchInstanceFilter)(nil),          // 16: google.cloud.osconfig.v1.PatchInstanceFilter
 	(*PatchConfig)(nil),                  // 17: google.cloud.osconfig.v1.PatchConfig
-	(*duration.Duration)(nil),            // 18: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),          // 19: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),          // 18: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),        // 19: google.protobuf.Timestamp
 	(*PatchRollout)(nil),                 // 20: google.cloud.osconfig.v1.PatchRollout
 	(*datetime.TimeZone)(nil),            // 21: google.type.TimeZone
 	(*timeofday.TimeOfDay)(nil),          // 22: google.type.TimeOfDay
 	(dayofweek.DayOfWeek)(0),             // 23: google.type.DayOfWeek
-	(*field_mask.FieldMask)(nil),         // 24: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),        // 24: google.protobuf.FieldMask
 }
 var file_google_cloud_osconfig_v1_patch_deployments_proto_depIdxs = []int32{
 	16, // 0: google.cloud.osconfig.v1.PatchDeployment.instance_filter:type_name -> google.cloud.osconfig.v1.PatchInstanceFilter
diff --git a/osconfig/apiv1/osconfigpb/patch_jobs.pb.go b/osconfig/apiv1/osconfigpb/patch_jobs.pb.go
index 0d78c11088b..1d1e6bd040f 100644
--- a/osconfig/apiv1/osconfigpb/patch_jobs.pb.go
+++ b/osconfig/apiv1/osconfigpb/patch_jobs.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/patch_jobs.proto
 
 package osconfigpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -567,7 +567,7 @@ type ExecutePatchJobRequest struct {
 	PatchConfig *PatchConfig `protobuf:"bytes,4,opt,name=patch_config,json=patchConfig,proto3" json:"patch_config,omitempty"`
 	// Duration of the patch job. After the duration ends, the patch job
 	// times out.
-	Duration *duration.Duration `protobuf:"bytes,5,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,5,opt,name=duration,proto3" json:"duration,omitempty"`
 	// If this patch is a dry-run only, instances are contacted but
 	// will do nothing.
 	DryRun bool `protobuf:"varint,6,opt,name=dry_run,json=dryRun,proto3" json:"dry_run,omitempty"`
@@ -637,7 +637,7 @@ func (x *ExecutePatchJobRequest) GetPatchConfig() *PatchConfig {
 	return nil
 }
 
-func (x *ExecutePatchJobRequest) GetDuration() *duration.Duration {
+func (x *ExecutePatchJobRequest) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -1101,9 +1101,9 @@ type PatchJob struct {
 	// to 1024 characters.
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Time this patch job was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Last time this patch job was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The current state of the PatchJob.
 	State PatchJob_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.cloud.osconfig.v1.PatchJob_State" json:"state,omitempty"`
 	// Instances to patch.
@@ -1112,7 +1112,7 @@ type PatchJob struct {
 	PatchConfig *PatchConfig `protobuf:"bytes,7,opt,name=patch_config,json=patchConfig,proto3" json:"patch_config,omitempty"`
 	// Duration of the patch job. After the duration ends, the
 	// patch job times out.
-	Duration *duration.Duration `protobuf:"bytes,8,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,8,opt,name=duration,proto3" json:"duration,omitempty"`
 	// Summary of instance details.
 	InstanceDetailsSummary *PatchJob_InstanceDetailsSummary `protobuf:"bytes,9,opt,name=instance_details_summary,json=instanceDetailsSummary,proto3" json:"instance_details_summary,omitempty"`
 	// If this patch job is a dry run, the agent reports that it has
@@ -1183,14 +1183,14 @@ func (x *PatchJob) GetDescription() string {
 	return ""
 }
 
-func (x *PatchJob) GetCreateTime() *timestamp.Timestamp {
+func (x *PatchJob) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *PatchJob) GetUpdateTime() *timestamp.Timestamp {
+func (x *PatchJob) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1218,7 +1218,7 @@ func (x *PatchJob) GetPatchConfig() *PatchConfig {
 	return nil
 }
 
-func (x *PatchJob) GetDuration() *duration.Duration {
+func (x *PatchJob) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -3013,8 +3013,8 @@ var file_google_cloud_osconfig_v1_patch_jobs_proto_goTypes = []interface{}{
 	(*PatchJob_InstanceDetailsSummary)(nil),     // 28: google.cloud.osconfig.v1.PatchJob.InstanceDetailsSummary
 	(*PatchInstanceFilter_GroupLabel)(nil),      // 29: google.cloud.osconfig.v1.PatchInstanceFilter.GroupLabel
 	nil,                                         // 30: google.cloud.osconfig.v1.PatchInstanceFilter.GroupLabel.LabelsEntry
-	(*duration.Duration)(nil),                   // 31: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),                 // 32: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                 // 31: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),               // 32: google.protobuf.Timestamp
 	(*FixedOrPercent)(nil),                      // 33: google.cloud.osconfig.v1.FixedOrPercent
 }
 var file_google_cloud_osconfig_v1_patch_jobs_proto_depIdxs = []int32{
diff --git a/osconfig/apiv1/osconfigpb/vulnerability.pb.go b/osconfig/apiv1/osconfigpb/vulnerability.pb.go
index 03a54a506c6..af71fa9598a 100644
--- a/osconfig/apiv1/osconfigpb/vulnerability.pb.go
+++ b/osconfig/apiv1/osconfigpb/vulnerability.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/osconfig/v1/vulnerability.proto
 
 package osconfigpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -419,7 +419,7 @@ type VulnerabilityReport struct {
 	Vulnerabilities []*VulnerabilityReport_Vulnerability `protobuf:"bytes,2,rep,name=vulnerabilities,proto3" json:"vulnerabilities,omitempty"`
 	// Output only. The timestamp for when the last vulnerability report was generated for the
 	// VM.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *VulnerabilityReport) Reset() {
@@ -468,7 +468,7 @@ func (x *VulnerabilityReport) GetVulnerabilities() []*VulnerabilityReport_Vulner
 	return nil
 }
 
-func (x *VulnerabilityReport) GetUpdateTime() *timestamp.Timestamp {
+func (x *VulnerabilityReport) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -855,9 +855,9 @@ type VulnerabilityReport_Vulnerability struct {
 	// Deprecated: Do not use.
 	AvailableInventoryItemIds []string `protobuf:"bytes,3,rep,name=available_inventory_item_ids,json=availableInventoryItemIds,proto3" json:"available_inventory_item_ids,omitempty"`
 	// The timestamp for when the vulnerability was first detected.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The timestamp for when the vulnerability was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// List of items affected by the vulnerability.
 	Items []*VulnerabilityReport_Vulnerability_Item `protobuf:"bytes,6,rep,name=items,proto3" json:"items,omitempty"`
 }
@@ -917,14 +917,14 @@ func (x *VulnerabilityReport_Vulnerability) GetAvailableInventoryItemIds() []str
 	return nil
 }
 
-func (x *VulnerabilityReport_Vulnerability) GetCreateTime() *timestamp.Timestamp {
+func (x *VulnerabilityReport_Vulnerability) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *VulnerabilityReport_Vulnerability) GetUpdateTime() *timestamp.Timestamp {
+func (x *VulnerabilityReport_Vulnerability) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1450,7 +1450,7 @@ var file_google_cloud_osconfig_v1_vulnerability_proto_goTypes = []interface{}{
 	(*VulnerabilityReport_Vulnerability_Details)(nil),           // 12: google.cloud.osconfig.v1.VulnerabilityReport.Vulnerability.Details
 	(*VulnerabilityReport_Vulnerability_Item)(nil),              // 13: google.cloud.osconfig.v1.VulnerabilityReport.Vulnerability.Item
 	(*VulnerabilityReport_Vulnerability_Details_Reference)(nil), // 14: google.cloud.osconfig.v1.VulnerabilityReport.Vulnerability.Details.Reference
-	(*timestamp.Timestamp)(nil),                                 // 15: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                               // 15: google.protobuf.Timestamp
 }
 var file_google_cloud_osconfig_v1_vulnerability_proto_depIdxs = []int32{
 	11, // 0: google.cloud.osconfig.v1.VulnerabilityReport.vulnerabilities:type_name -> google.cloud.osconfig.v1.VulnerabilityReport.Vulnerability
diff --git a/osconfig/go.mod b/osconfig/go.mod
index 3568698012c..8af56b00c9c 100644
--- a/osconfig/go.mod
+++ b/osconfig/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/osconfig
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/osconfig/go.sum b/osconfig/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/osconfig/go.sum
+++ b/osconfig/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/oslogin/apiv1/doc.go b/oslogin/apiv1/doc.go
index 88b3830184c..27b2caa8c7e 100644
--- a/oslogin/apiv1/doc.go
+++ b/oslogin/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &osloginpb.DeletePosixAccountRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/oslogin/v1#DeletePosixAccountRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/oslogin/apiv1/osloginpb#DeletePosixAccountRequest.
 //	}
 //	err = c.DeletePosixAccount(ctx, req)
 //	if err != nil {
diff --git a/oslogin/apiv1/os_login_client.go b/oslogin/apiv1/os_login_client.go
index 3beb5613d3e..ced1b39da62 100644
--- a/oslogin/apiv1/os_login_client.go
+++ b/oslogin/apiv1/os_login_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	osloginpb "cloud.google.com/go/oslogin/apiv1/osloginpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	commonpb "google.golang.org/genproto/googleapis/cloud/oslogin/common"
-	osloginpb "google.golang.org/genproto/googleapis/cloud/oslogin/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/oslogin/apiv1/os_login_client_example_test.go b/oslogin/apiv1/os_login_client_example_test.go
index f12f1d8ea96..4fb062b16d0 100644
--- a/oslogin/apiv1/os_login_client_example_test.go
+++ b/oslogin/apiv1/os_login_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	oslogin "cloud.google.com/go/oslogin/apiv1"
-	osloginpb "google.golang.org/genproto/googleapis/cloud/oslogin/v1"
+	osloginpb "cloud.google.com/go/oslogin/apiv1/osloginpb"
 )
 
 func ExampleNewClient() {
@@ -55,7 +55,7 @@ func ExampleClient_DeletePosixAccount() {
 
 	req := &osloginpb.DeletePosixAccountRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/oslogin/v1#DeletePosixAccountRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/oslogin/apiv1/osloginpb#DeletePosixAccountRequest.
 	}
 	err = c.DeletePosixAccount(ctx, req)
 	if err != nil {
@@ -78,7 +78,7 @@ func ExampleClient_DeleteSshPublicKey() {
 
 	req := &osloginpb.DeleteSshPublicKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/oslogin/v1#DeleteSshPublicKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/oslogin/apiv1/osloginpb#DeleteSshPublicKeyRequest.
 	}
 	err = c.DeleteSshPublicKey(ctx, req)
 	if err != nil {
@@ -101,7 +101,7 @@ func ExampleClient_GetLoginProfile() {
 
 	req := &osloginpb.GetLoginProfileRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/oslogin/v1#GetLoginProfileRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/oslogin/apiv1/osloginpb#GetLoginProfileRequest.
 	}
 	resp, err := c.GetLoginProfile(ctx, req)
 	if err != nil {
@@ -126,7 +126,7 @@ func ExampleClient_GetSshPublicKey() {
 
 	req := &osloginpb.GetSshPublicKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/oslogin/v1#GetSshPublicKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/oslogin/apiv1/osloginpb#GetSshPublicKeyRequest.
 	}
 	resp, err := c.GetSshPublicKey(ctx, req)
 	if err != nil {
@@ -151,7 +151,7 @@ func ExampleClient_ImportSshPublicKey() {
 
 	req := &osloginpb.ImportSshPublicKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/oslogin/v1#ImportSshPublicKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/oslogin/apiv1/osloginpb#ImportSshPublicKeyRequest.
 	}
 	resp, err := c.ImportSshPublicKey(ctx, req)
 	if err != nil {
@@ -176,7 +176,7 @@ func ExampleClient_UpdateSshPublicKey() {
 
 	req := &osloginpb.UpdateSshPublicKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/oslogin/v1#UpdateSshPublicKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/oslogin/apiv1/osloginpb#UpdateSshPublicKeyRequest.
 	}
 	resp, err := c.UpdateSshPublicKey(ctx, req)
 	if err != nil {
diff --git a/oslogin/apiv1/osloginpb/oslogin.pb.go b/oslogin/apiv1/osloginpb/oslogin.pb.go
index d71b66d832c..c0cebfa236b 100644
--- a/oslogin/apiv1/osloginpb/oslogin.pb.go
+++ b/oslogin/apiv1/osloginpb/oslogin.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/oslogin/v1/oslogin.proto
 
 package osloginpb
@@ -26,15 +26,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -461,7 +461,7 @@ type UpdateSshPublicKeyRequest struct {
 	// Required. The SSH public key and expiration time.
 	SshPublicKey *common.SshPublicKey `protobuf:"bytes,2,opt,name=ssh_public_key,json=sshPublicKey,proto3" json:"ssh_public_key,omitempty"`
 	// Mask to control which fields get updated. Updates all if not present.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSshPublicKeyRequest) Reset() {
@@ -510,7 +510,7 @@ func (x *UpdateSshPublicKeyRequest) GetSshPublicKey() *common.SshPublicKey {
 	return nil
 }
 
-func (x *UpdateSshPublicKeyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSshPublicKeyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -738,8 +738,8 @@ var file_google_cloud_oslogin_v1_oslogin_proto_goTypes = []interface{}{
 	nil,                                // 8: google.cloud.oslogin.v1.LoginProfile.SshPublicKeysEntry
 	(*common.PosixAccount)(nil),        // 9: google.cloud.oslogin.common.PosixAccount
 	(*common.SshPublicKey)(nil),        // 10: google.cloud.oslogin.common.SshPublicKey
-	(*field_mask.FieldMask)(nil),       // 11: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                // 12: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),      // 11: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),              // 12: google.protobuf.Empty
 }
 var file_google_cloud_oslogin_v1_oslogin_proto_depIdxs = []int32{
 	9,  // 0: google.cloud.oslogin.v1.LoginProfile.posix_accounts:type_name -> google.cloud.oslogin.common.PosixAccount
@@ -904,9 +904,9 @@ const _ = grpc.SupportPackageIsVersion6
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type OsLoginServiceClient interface {
 	// Deletes a POSIX account.
-	DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Deletes an SSH public key.
-	DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Retrieves the profile information used for logging in to a virtual machine
 	// on Google Compute Engine.
 	GetLoginProfile(ctx context.Context, in *GetLoginProfileRequest, opts ...grpc.CallOption) (*LoginProfile, error)
@@ -929,8 +929,8 @@ func NewOsLoginServiceClient(cc grpc.ClientConnInterface) OsLoginServiceClient {
 	return &osLoginServiceClient{cc}
 }
 
-func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *DeletePosixAccountRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/DeletePosixAccount", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -938,8 +938,8 @@ func (c *osLoginServiceClient) DeletePosixAccount(ctx context.Context, in *Delet
 	return out, nil
 }
 
-func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *osLoginServiceClient) DeleteSshPublicKey(ctx context.Context, in *DeleteSshPublicKeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.oslogin.v1.OsLoginService/DeleteSshPublicKey", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -986,9 +986,9 @@ func (c *osLoginServiceClient) UpdateSshPublicKey(ctx context.Context, in *Updat
 // OsLoginServiceServer is the server API for OsLoginService service.
 type OsLoginServiceServer interface {
 	// Deletes a POSIX account.
-	DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*empty.Empty, error)
+	DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*emptypb.Empty, error)
 	// Deletes an SSH public key.
-	DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*empty.Empty, error)
+	DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*emptypb.Empty, error)
 	// Retrieves the profile information used for logging in to a virtual machine
 	// on Google Compute Engine.
 	GetLoginProfile(context.Context, *GetLoginProfileRequest) (*LoginProfile, error)
@@ -1007,10 +1007,10 @@ type OsLoginServiceServer interface {
 type UnimplementedOsLoginServiceServer struct {
 }
 
-func (*UnimplementedOsLoginServiceServer) DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*empty.Empty, error) {
+func (*UnimplementedOsLoginServiceServer) DeletePosixAccount(context.Context, *DeletePosixAccountRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletePosixAccount not implemented")
 }
-func (*UnimplementedOsLoginServiceServer) DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*empty.Empty, error) {
+func (*UnimplementedOsLoginServiceServer) DeleteSshPublicKey(context.Context, *DeleteSshPublicKeyRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteSshPublicKey not implemented")
 }
 func (*UnimplementedOsLoginServiceServer) GetLoginProfile(context.Context, *GetLoginProfileRequest) (*LoginProfile, error) {
diff --git a/oslogin/go.mod b/oslogin/go.mod
index c292f984f53..6e6668b6b4a 100644
--- a/oslogin/go.mod
+++ b/oslogin/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/oslogin/go.sum b/oslogin/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/oslogin/go.sum
+++ b/oslogin/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/policytroubleshooter/aliasshim/aliasshim.go b/policytroubleshooter/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/policytroubleshooter/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/policytroubleshooter/apiv1/doc.go b/policytroubleshooter/apiv1/doc.go
index be1f2d87dcc..cec2cc1e3a6 100644
--- a/policytroubleshooter/apiv1/doc.go
+++ b/policytroubleshooter/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &policytroubleshooterpb.TroubleshootIamPolicyRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/policytroubleshooter/v1#TroubleshootIamPolicyRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/policytroubleshooter/apiv1/policytroubleshooterpb#TroubleshootIamPolicyRequest.
 //	}
 //	resp, err := c.TroubleshootIamPolicy(ctx, req)
 //	if err != nil {
diff --git a/policytroubleshooter/apiv1/iam_checker_client.go b/policytroubleshooter/apiv1/iam_checker_client.go
index 6ef8113b104..c99cf002738 100644
--- a/policytroubleshooter/apiv1/iam_checker_client.go
+++ b/policytroubleshooter/apiv1/iam_checker_client.go
@@ -21,11 +21,11 @@ import (
 	"math"
 	"time"
 
+	policytroubleshooterpb "cloud.google.com/go/policytroubleshooter/apiv1/policytroubleshooterpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	policytroubleshooterpb "google.golang.org/genproto/googleapis/cloud/policytroubleshooter/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/policytroubleshooter/apiv1/iam_checker_client_example_test.go b/policytroubleshooter/apiv1/iam_checker_client_example_test.go
index c6e092bc88c..fcbcaa44b6e 100644
--- a/policytroubleshooter/apiv1/iam_checker_client_example_test.go
+++ b/policytroubleshooter/apiv1/iam_checker_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	policytroubleshooter "cloud.google.com/go/policytroubleshooter/apiv1"
-	policytroubleshooterpb "google.golang.org/genproto/googleapis/cloud/policytroubleshooter/v1"
+	policytroubleshooterpb "cloud.google.com/go/policytroubleshooter/apiv1/policytroubleshooterpb"
 )
 
 func ExampleNewIamCheckerClient() {
@@ -55,7 +55,7 @@ func ExampleIamCheckerClient_TroubleshootIamPolicy() {
 
 	req := &policytroubleshooterpb.TroubleshootIamPolicyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/policytroubleshooter/v1#TroubleshootIamPolicyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/policytroubleshooter/apiv1/policytroubleshooterpb#TroubleshootIamPolicyRequest.
 	}
 	resp, err := c.TroubleshootIamPolicy(ctx, req)
 	if err != nil {
diff --git a/policytroubleshooter/apiv1/policytroubleshooterpb/checker.pb.go b/policytroubleshooter/apiv1/policytroubleshooterpb/checker.pb.go
index 46f439dd6d7..d922520206b 100644
--- a/policytroubleshooter/apiv1/policytroubleshooterpb/checker.pb.go
+++ b/policytroubleshooter/apiv1/policytroubleshooterpb/checker.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/policytroubleshooter/v1/checker.proto
 
 package policytroubleshooterpb
diff --git a/policytroubleshooter/apiv1/policytroubleshooterpb/explanations.pb.go b/policytroubleshooter/apiv1/policytroubleshooterpb/explanations.pb.go
index d1bbeabe14b..187b0b48605 100644
--- a/policytroubleshooter/apiv1/policytroubleshooterpb/explanations.pb.go
+++ b/policytroubleshooter/apiv1/policytroubleshooterpb/explanations.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/policytroubleshooter/v1/explanations.proto
 
 package policytroubleshooterpb
diff --git a/policytroubleshooter/go.mod b/policytroubleshooter/go.mod
index 54d1d9fce67..269a57b4460 100644
--- a/policytroubleshooter/go.mod
+++ b/policytroubleshooter/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/policytroubleshooter/go.sum b/policytroubleshooter/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/policytroubleshooter/go.sum
+++ b/policytroubleshooter/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/recaptchaenterprise/aliasshim/aliasshim.go b/recaptchaenterprise/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/recaptchaenterprise/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/recaptchaenterprise/v2/apiv1/doc.go b/recaptchaenterprise/v2/apiv1/doc.go
index 804b3343c63..86127b7eed6 100644
--- a/recaptchaenterprise/v2/apiv1/doc.go
+++ b/recaptchaenterprise/v2/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &recaptchaenterprisepb.CreateAssessmentRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#CreateAssessmentRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#CreateAssessmentRequest.
 //	}
 //	resp, err := c.CreateAssessment(ctx, req)
 //	if err != nil {
diff --git a/recaptchaenterprise/v2/apiv1/recaptcha_enterprise_client.go b/recaptchaenterprise/v2/apiv1/recaptcha_enterprise_client.go
index 7584bf250ce..c34d4794e39 100644
--- a/recaptchaenterprise/v2/apiv1/recaptcha_enterprise_client.go
+++ b/recaptchaenterprise/v2/apiv1/recaptcha_enterprise_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	recaptchaenterprisepb "cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	recaptchaenterprisepb "google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/recaptchaenterprise/v2/apiv1/recaptcha_enterprise_client_example_test.go b/recaptchaenterprise/v2/apiv1/recaptcha_enterprise_client_example_test.go
index 8c83b972b85..49d797d3fb4 100644
--- a/recaptchaenterprise/v2/apiv1/recaptcha_enterprise_client_example_test.go
+++ b/recaptchaenterprise/v2/apiv1/recaptcha_enterprise_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	recaptchaenterprise "cloud.google.com/go/recaptchaenterprise/v2/apiv1"
+	recaptchaenterprisepb "cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb"
 	"google.golang.org/api/iterator"
-	recaptchaenterprisepb "google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_CreateAssessment() {
 
 	req := &recaptchaenterprisepb.CreateAssessmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#CreateAssessmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#CreateAssessmentRequest.
 	}
 	resp, err := c.CreateAssessment(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_AnnotateAssessment() {
 
 	req := &recaptchaenterprisepb.AnnotateAssessmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#AnnotateAssessmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#AnnotateAssessmentRequest.
 	}
 	resp, err := c.AnnotateAssessment(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleClient_CreateKey() {
 
 	req := &recaptchaenterprisepb.CreateKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#CreateKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#CreateKeyRequest.
 	}
 	resp, err := c.CreateKey(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleClient_ListKeys() {
 
 	req := &recaptchaenterprisepb.ListKeysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#ListKeysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#ListKeysRequest.
 	}
 	it := c.ListKeys(ctx, req)
 	for {
@@ -162,7 +162,7 @@ func ExampleClient_RetrieveLegacySecretKey() {
 
 	req := &recaptchaenterprisepb.RetrieveLegacySecretKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#RetrieveLegacySecretKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#RetrieveLegacySecretKeyRequest.
 	}
 	resp, err := c.RetrieveLegacySecretKey(ctx, req)
 	if err != nil {
@@ -187,7 +187,7 @@ func ExampleClient_GetKey() {
 
 	req := &recaptchaenterprisepb.GetKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#GetKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#GetKeyRequest.
 	}
 	resp, err := c.GetKey(ctx, req)
 	if err != nil {
@@ -212,7 +212,7 @@ func ExampleClient_UpdateKey() {
 
 	req := &recaptchaenterprisepb.UpdateKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#UpdateKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#UpdateKeyRequest.
 	}
 	resp, err := c.UpdateKey(ctx, req)
 	if err != nil {
@@ -237,7 +237,7 @@ func ExampleClient_DeleteKey() {
 
 	req := &recaptchaenterprisepb.DeleteKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#DeleteKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#DeleteKeyRequest.
 	}
 	err = c.DeleteKey(ctx, req)
 	if err != nil {
@@ -260,7 +260,7 @@ func ExampleClient_MigrateKey() {
 
 	req := &recaptchaenterprisepb.MigrateKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#MigrateKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#MigrateKeyRequest.
 	}
 	resp, err := c.MigrateKey(ctx, req)
 	if err != nil {
@@ -285,7 +285,7 @@ func ExampleClient_GetMetrics() {
 
 	req := &recaptchaenterprisepb.GetMetricsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#GetMetricsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#GetMetricsRequest.
 	}
 	resp, err := c.GetMetrics(ctx, req)
 	if err != nil {
@@ -310,7 +310,7 @@ func ExampleClient_ListRelatedAccountGroups() {
 
 	req := &recaptchaenterprisepb.ListRelatedAccountGroupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#ListRelatedAccountGroupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#ListRelatedAccountGroupsRequest.
 	}
 	it := c.ListRelatedAccountGroups(ctx, req)
 	for {
@@ -341,7 +341,7 @@ func ExampleClient_ListRelatedAccountGroupMemberships() {
 
 	req := &recaptchaenterprisepb.ListRelatedAccountGroupMembershipsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#ListRelatedAccountGroupMembershipsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#ListRelatedAccountGroupMembershipsRequest.
 	}
 	it := c.ListRelatedAccountGroupMemberships(ctx, req)
 	for {
@@ -372,7 +372,7 @@ func ExampleClient_SearchRelatedAccountGroupMemberships() {
 
 	req := &recaptchaenterprisepb.SearchRelatedAccountGroupMembershipsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recaptchaenterprise/v1#SearchRelatedAccountGroupMembershipsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb#SearchRelatedAccountGroupMembershipsRequest.
 	}
 	it := c.SearchRelatedAccountGroupMemberships(ctx, req)
 	for {
diff --git a/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb/recaptchaenterprise.pb.go b/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb/recaptchaenterprise.pb.go
index 411e77287cd..699401a3bd8 100644
--- a/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb/recaptchaenterprise.pb.go
+++ b/recaptchaenterprise/v2/apiv1/recaptchaenterprisepb/recaptchaenterprise.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/recaptchaenterprise/v1/recaptchaenterprise.proto
 
 package recaptchaenterprisepb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1251,7 +1251,7 @@ type TokenProperties struct {
 	// Reason associated with the response when valid = false.
 	InvalidReason TokenProperties_InvalidReason `protobuf:"varint,2,opt,name=invalid_reason,json=invalidReason,proto3,enum=google.cloud.recaptchaenterprise.v1.TokenProperties_InvalidReason" json:"invalid_reason,omitempty"`
 	// The timestamp corresponding to the generation of the token.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The hostname of the page on which the token was generated (Web keys only).
 	Hostname string `protobuf:"bytes,4,opt,name=hostname,proto3" json:"hostname,omitempty"`
 	// Action name provided at token generation.
@@ -1304,7 +1304,7 @@ func (x *TokenProperties) GetInvalidReason() TokenProperties_InvalidReason {
 	return TokenProperties_INVALID_REASON_UNSPECIFIED
 }
 
-func (x *TokenProperties) GetCreateTime() *timestamp.Timestamp {
+func (x *TokenProperties) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1672,7 +1672,7 @@ type UpdateKeyRequest struct {
 	Key *Key `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
 	// Optional. The mask to control which fields of the key get updated. If the mask is not
 	// present, all fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateKeyRequest) Reset() {
@@ -1714,7 +1714,7 @@ func (x *UpdateKeyRequest) GetKey() *Key {
 	return nil
 }
 
-func (x *UpdateKeyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateKeyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1881,7 +1881,7 @@ type Metrics struct {
 	// "projects/{project}/keys/{key}/metrics".
 	Name string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
 	// Inclusive start time aligned to a day (UTC).
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Metrics will be continuous and in order by dates, and in the granularity
 	// of day. All Key types should have score-based data.
 	ScoreMetrics []*ScoreMetrics `protobuf:"bytes,2,rep,name=score_metrics,json=scoreMetrics,proto3" json:"score_metrics,omitempty"`
@@ -1930,7 +1930,7 @@ func (x *Metrics) GetName() string {
 	return ""
 }
 
-func (x *Metrics) GetStartTime() *timestamp.Timestamp {
+func (x *Metrics) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -2029,7 +2029,7 @@ type Key struct {
 	// Creating and managing labels</a>.
 	Labels map[string]string `protobuf:"bytes,6,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The timestamp corresponding to the creation of this Key.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Options for user acceptance testing.
 	TestingOptions *TestingOptions `protobuf:"bytes,9,opt,name=testing_options,json=testingOptions,proto3" json:"testing_options,omitempty"`
 	// Settings for WAF
@@ -2117,7 +2117,7 @@ func (x *Key) GetLabels() map[string]string {
 	return nil
 }
 
-func (x *Key) GetCreateTime() *timestamp.Timestamp {
+func (x *Key) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -4098,9 +4098,9 @@ var file_google_cloud_recaptchaenterprise_v1_recaptchaenterprise_proto_goTypes =
 	nil,                                                  // 47: google.cloud.recaptchaenterprise.v1.Key.LabelsEntry
 	nil,                                                  // 48: google.cloud.recaptchaenterprise.v1.ScoreDistribution.ScoreBucketsEntry
 	nil,                                                  // 49: google.cloud.recaptchaenterprise.v1.ScoreMetrics.ActionMetricsEntry
-	(*timestamp.Timestamp)(nil),                          // 50: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                         // 51: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                                  // 52: google.protobuf.Empty
+	(*timestamppb.Timestamp)(nil),                        // 50: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                        // 51: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                                // 52: google.protobuf.Empty
 }
 var file_google_cloud_recaptchaenterprise_v1_recaptchaenterprise_proto_depIdxs = []int32{
 	14, // 0: google.cloud.recaptchaenterprise.v1.CreateAssessmentRequest.assessment:type_name -> google.cloud.recaptchaenterprise.v1.Assessment
@@ -4681,7 +4681,7 @@ type RecaptchaEnterpriseServiceClient interface {
 	// Updates the specified key.
 	UpdateKey(ctx context.Context, in *UpdateKeyRequest, opts ...grpc.CallOption) (*Key, error)
 	// Deletes the specified key.
-	DeleteKey(ctx context.Context, in *DeleteKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteKey(ctx context.Context, in *DeleteKeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Migrates an existing key from reCAPTCHA to reCAPTCHA Enterprise.
 	// Once a key is migrated, it can be used from either product. SiteVerify
 	// requests are billed as CreateAssessment calls. You must be
@@ -4771,8 +4771,8 @@ func (c *recaptchaEnterpriseServiceClient) UpdateKey(ctx context.Context, in *Up
 	return out, nil
 }
 
-func (c *recaptchaEnterpriseServiceClient) DeleteKey(ctx context.Context, in *DeleteKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *recaptchaEnterpriseServiceClient) DeleteKey(ctx context.Context, in *DeleteKeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.recaptchaenterprise.v1.RecaptchaEnterpriseService/DeleteKey", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -4845,7 +4845,7 @@ type RecaptchaEnterpriseServiceServer interface {
 	// Updates the specified key.
 	UpdateKey(context.Context, *UpdateKeyRequest) (*Key, error)
 	// Deletes the specified key.
-	DeleteKey(context.Context, *DeleteKeyRequest) (*empty.Empty, error)
+	DeleteKey(context.Context, *DeleteKeyRequest) (*emptypb.Empty, error)
 	// Migrates an existing key from reCAPTCHA to reCAPTCHA Enterprise.
 	// Once a key is migrated, it can be used from either product. SiteVerify
 	// requests are billed as CreateAssessment calls. You must be
@@ -4889,7 +4889,7 @@ func (*UnimplementedRecaptchaEnterpriseServiceServer) GetKey(context.Context, *G
 func (*UnimplementedRecaptchaEnterpriseServiceServer) UpdateKey(context.Context, *UpdateKeyRequest) (*Key, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateKey not implemented")
 }
-func (*UnimplementedRecaptchaEnterpriseServiceServer) DeleteKey(context.Context, *DeleteKeyRequest) (*empty.Empty, error) {
+func (*UnimplementedRecaptchaEnterpriseServiceServer) DeleteKey(context.Context, *DeleteKeyRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteKey not implemented")
 }
 func (*UnimplementedRecaptchaEnterpriseServiceServer) MigrateKey(context.Context, *MigrateKeyRequest) (*Key, error) {
diff --git a/recaptchaenterprise/v2/go.mod b/recaptchaenterprise/v2/go.mod
index 971bbb2cb29..9643a0aced0 100644
--- a/recaptchaenterprise/v2/go.mod
+++ b/recaptchaenterprise/v2/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -18,9 +18,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/recaptchaenterprise/v2/go.sum b/recaptchaenterprise/v2/go.sum
index 5f05a19ca72..5f1e3ea097a 100644
--- a/recaptchaenterprise/v2/go.sum
+++ b/recaptchaenterprise/v2/go.sum
@@ -27,6 +27,7 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW
 cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
 cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
 cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -41,6 +42,7 @@ cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5J
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -282,8 +284,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -382,8 +384,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -560,8 +563,8 @@ google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX
 google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
 google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b h1:IOQ/4u8ZSLV+xns0LQxzdAcdOJTDMWB+0shVM8KWXBE=
-google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
diff --git a/recommender/apiv1/doc.go b/recommender/apiv1/doc.go
index a3accfd443d..efe69cc14f4 100644
--- a/recommender/apiv1/doc.go
+++ b/recommender/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &recommenderpb.ListInsightsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#ListInsightsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#ListInsightsRequest.
 //	}
 //	it := c.ListInsights(ctx, req)
 //	for {
diff --git a/recommender/apiv1/recommender_client.go b/recommender/apiv1/recommender_client.go
index af64bdeac95..5e654f25a43 100644
--- a/recommender/apiv1/recommender_client.go
+++ b/recommender/apiv1/recommender_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	recommenderpb "cloud.google.com/go/recommender/apiv1/recommenderpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	recommenderpb "google.golang.org/genproto/googleapis/cloud/recommender/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/recommender/apiv1/recommender_client_example_test.go b/recommender/apiv1/recommender_client_example_test.go
index 9350f85b521..8cdf278872a 100644
--- a/recommender/apiv1/recommender_client_example_test.go
+++ b/recommender/apiv1/recommender_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	recommender "cloud.google.com/go/recommender/apiv1"
+	recommenderpb "cloud.google.com/go/recommender/apiv1/recommenderpb"
 	"google.golang.org/api/iterator"
-	recommenderpb "google.golang.org/genproto/googleapis/cloud/recommender/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListInsights() {
 
 	req := &recommenderpb.ListInsightsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#ListInsightsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#ListInsightsRequest.
 	}
 	it := c.ListInsights(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetInsight() {
 
 	req := &recommenderpb.GetInsightRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#GetInsightRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#GetInsightRequest.
 	}
 	resp, err := c.GetInsight(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_MarkInsightAccepted() {
 
 	req := &recommenderpb.MarkInsightAcceptedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#MarkInsightAcceptedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#MarkInsightAcceptedRequest.
 	}
 	resp, err := c.MarkInsightAccepted(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleClient_ListRecommendations() {
 
 	req := &recommenderpb.ListRecommendationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#ListRecommendationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#ListRecommendationsRequest.
 	}
 	it := c.ListRecommendations(ctx, req)
 	for {
@@ -168,7 +168,7 @@ func ExampleClient_GetRecommendation() {
 
 	req := &recommenderpb.GetRecommendationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#GetRecommendationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#GetRecommendationRequest.
 	}
 	resp, err := c.GetRecommendation(ctx, req)
 	if err != nil {
@@ -193,7 +193,7 @@ func ExampleClient_MarkRecommendationClaimed() {
 
 	req := &recommenderpb.MarkRecommendationClaimedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#MarkRecommendationClaimedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#MarkRecommendationClaimedRequest.
 	}
 	resp, err := c.MarkRecommendationClaimed(ctx, req)
 	if err != nil {
@@ -218,7 +218,7 @@ func ExampleClient_MarkRecommendationSucceeded() {
 
 	req := &recommenderpb.MarkRecommendationSucceededRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#MarkRecommendationSucceededRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#MarkRecommendationSucceededRequest.
 	}
 	resp, err := c.MarkRecommendationSucceeded(ctx, req)
 	if err != nil {
@@ -243,7 +243,7 @@ func ExampleClient_MarkRecommendationFailed() {
 
 	req := &recommenderpb.MarkRecommendationFailedRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#MarkRecommendationFailedRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#MarkRecommendationFailedRequest.
 	}
 	resp, err := c.MarkRecommendationFailed(ctx, req)
 	if err != nil {
@@ -268,7 +268,7 @@ func ExampleClient_GetRecommenderConfig() {
 
 	req := &recommenderpb.GetRecommenderConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#GetRecommenderConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#GetRecommenderConfigRequest.
 	}
 	resp, err := c.GetRecommenderConfig(ctx, req)
 	if err != nil {
@@ -293,7 +293,7 @@ func ExampleClient_UpdateRecommenderConfig() {
 
 	req := &recommenderpb.UpdateRecommenderConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#UpdateRecommenderConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#UpdateRecommenderConfigRequest.
 	}
 	resp, err := c.UpdateRecommenderConfig(ctx, req)
 	if err != nil {
@@ -318,7 +318,7 @@ func ExampleClient_GetInsightTypeConfig() {
 
 	req := &recommenderpb.GetInsightTypeConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#GetInsightTypeConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#GetInsightTypeConfigRequest.
 	}
 	resp, err := c.GetInsightTypeConfig(ctx, req)
 	if err != nil {
@@ -343,7 +343,7 @@ func ExampleClient_UpdateInsightTypeConfig() {
 
 	req := &recommenderpb.UpdateInsightTypeConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/recommender/v1#UpdateInsightTypeConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/recommender/apiv1/recommenderpb#UpdateInsightTypeConfigRequest.
 	}
 	resp, err := c.UpdateInsightTypeConfig(ctx, req)
 	if err != nil {
diff --git a/recommender/apiv1/recommenderpb/insight.pb.go b/recommender/apiv1/recommenderpb/insight.pb.go
index d8d287f230e..639ed3faed7 100644
--- a/recommender/apiv1/recommenderpb/insight.pb.go
+++ b/recommender/apiv1/recommenderpb/insight.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/recommender/v1/insight.proto
 
 package recommenderpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -242,13 +242,13 @@ type Insight struct {
 	InsightSubtype string `protobuf:"bytes,10,opt,name=insight_subtype,json=insightSubtype,proto3" json:"insight_subtype,omitempty"`
 	// A struct of custom fields to explain the insight.
 	// Example: "grantedPermissionsCount": "1000"
-	Content *_struct.Struct `protobuf:"bytes,3,opt,name=content,proto3" json:"content,omitempty"`
+	Content *structpb.Struct `protobuf:"bytes,3,opt,name=content,proto3" json:"content,omitempty"`
 	// Timestamp of the latest data used to generate the insight.
-	LastRefreshTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_refresh_time,json=lastRefreshTime,proto3" json:"last_refresh_time,omitempty"`
+	LastRefreshTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_refresh_time,json=lastRefreshTime,proto3" json:"last_refresh_time,omitempty"`
 	// Observation period that led to the insight. The source data used to
 	// generate the insight ends at last_refresh_time and begins at
 	// (last_refresh_time - observation_period).
-	ObservationPeriod *duration.Duration `protobuf:"bytes,5,opt,name=observation_period,json=observationPeriod,proto3" json:"observation_period,omitempty"`
+	ObservationPeriod *durationpb.Duration `protobuf:"bytes,5,opt,name=observation_period,json=observationPeriod,proto3" json:"observation_period,omitempty"`
 	// Information state and metadata.
 	StateInfo *InsightStateInfo `protobuf:"bytes,6,opt,name=state_info,json=stateInfo,proto3" json:"state_info,omitempty"`
 	// Category being targeted by the insight.
@@ -322,21 +322,21 @@ func (x *Insight) GetInsightSubtype() string {
 	return ""
 }
 
-func (x *Insight) GetContent() *_struct.Struct {
+func (x *Insight) GetContent() *structpb.Struct {
 	if x != nil {
 		return x.Content
 	}
 	return nil
 }
 
-func (x *Insight) GetLastRefreshTime() *timestamp.Timestamp {
+func (x *Insight) GetLastRefreshTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastRefreshTime
 	}
 	return nil
 }
 
-func (x *Insight) GetObservationPeriod() *duration.Duration {
+func (x *Insight) GetObservationPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.ObservationPeriod
 	}
@@ -665,9 +665,9 @@ var file_google_cloud_recommender_v1_insight_proto_goTypes = []interface{}{
 	(*InsightStateInfo)(nil),                // 4: google.cloud.recommender.v1.InsightStateInfo
 	(*Insight_RecommendationReference)(nil), // 5: google.cloud.recommender.v1.Insight.RecommendationReference
 	nil,                                     // 6: google.cloud.recommender.v1.InsightStateInfo.StateMetadataEntry
-	(*_struct.Struct)(nil),                  // 7: google.protobuf.Struct
-	(*timestamp.Timestamp)(nil),             // 8: google.protobuf.Timestamp
-	(*duration.Duration)(nil),               // 9: google.protobuf.Duration
+	(*structpb.Struct)(nil),                 // 7: google.protobuf.Struct
+	(*timestamppb.Timestamp)(nil),           // 8: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),             // 9: google.protobuf.Duration
 }
 var file_google_cloud_recommender_v1_insight_proto_depIdxs = []int32{
 	7, // 0: google.cloud.recommender.v1.Insight.content:type_name -> google.protobuf.Struct
diff --git a/recommender/apiv1/recommenderpb/insight_type_config.pb.go b/recommender/apiv1/recommenderpb/insight_type_config.pb.go
index f6393db8026..48727947705 100644
--- a/recommender/apiv1/recommenderpb/insight_type_config.pb.go
+++ b/recommender/apiv1/recommenderpb/insight_type_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/recommender/v1/insight_type_config.proto
 
 package recommenderpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -55,7 +55,7 @@ type InsightTypeConfig struct {
 	// updating.
 	Etag string `protobuf:"bytes,3,opt,name=etag,proto3" json:"etag,omitempty"`
 	// Last time when the config was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Immutable. The revision ID of the config.
 	// A new revision is committed whenever the config is changed in any way.
 	// The format is an 8-character hexadecimal string.
@@ -127,7 +127,7 @@ func (x *InsightTypeConfig) GetEtag() string {
 	return ""
 }
 
-func (x *InsightTypeConfig) GetUpdateTime() *timestamp.Timestamp {
+func (x *InsightTypeConfig) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -165,7 +165,7 @@ type InsightTypeGenerationConfig struct {
 
 	// Parameters for this InsightTypeGenerationConfig. These configs can be used
 	// by or are applied to all subtypes.
-	Params *_struct.Struct `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"`
+	Params *structpb.Struct `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"`
 }
 
 func (x *InsightTypeGenerationConfig) Reset() {
@@ -200,7 +200,7 @@ func (*InsightTypeGenerationConfig) Descriptor() ([]byte, []int) {
 	return file_google_cloud_recommender_v1_insight_type_config_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *InsightTypeGenerationConfig) GetParams() *_struct.Struct {
+func (x *InsightTypeGenerationConfig) GetParams() *structpb.Struct {
 	if x != nil {
 		return x.Params
 	}
@@ -303,8 +303,8 @@ var file_google_cloud_recommender_v1_insight_type_config_proto_goTypes = []inter
 	(*InsightTypeConfig)(nil),           // 0: google.cloud.recommender.v1.InsightTypeConfig
 	(*InsightTypeGenerationConfig)(nil), // 1: google.cloud.recommender.v1.InsightTypeGenerationConfig
 	nil,                                 // 2: google.cloud.recommender.v1.InsightTypeConfig.AnnotationsEntry
-	(*timestamp.Timestamp)(nil),         // 3: google.protobuf.Timestamp
-	(*_struct.Struct)(nil),              // 4: google.protobuf.Struct
+	(*timestamppb.Timestamp)(nil),       // 3: google.protobuf.Timestamp
+	(*structpb.Struct)(nil),             // 4: google.protobuf.Struct
 }
 var file_google_cloud_recommender_v1_insight_type_config_proto_depIdxs = []int32{
 	1, // 0: google.cloud.recommender.v1.InsightTypeConfig.insight_type_generation_config:type_name -> google.cloud.recommender.v1.InsightTypeGenerationConfig
diff --git a/recommender/apiv1/recommenderpb/recommendation.pb.go b/recommender/apiv1/recommenderpb/recommendation.pb.go
index 7783159454b..104c40d32aa 100644
--- a/recommender/apiv1/recommenderpb/recommendation.pb.go
+++ b/recommender/apiv1/recommenderpb/recommendation.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/recommender/v1/recommendation.proto
 
 package recommenderpb
@@ -24,13 +24,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	money "google.golang.org/genproto/googleapis/type/money"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -267,7 +267,7 @@ type Recommendation struct {
 	RecommenderSubtype string `protobuf:"bytes,12,opt,name=recommender_subtype,json=recommenderSubtype,proto3" json:"recommender_subtype,omitempty"`
 	// Last time this recommendation was refreshed by the system that created it
 	// in the first place.
-	LastRefreshTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_refresh_time,json=lastRefreshTime,proto3" json:"last_refresh_time,omitempty"`
+	LastRefreshTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_refresh_time,json=lastRefreshTime,proto3" json:"last_refresh_time,omitempty"`
 	// The primary impact that this recommendation can have while trying to
 	// optimize for one category.
 	PrimaryImpact *Impact `protobuf:"bytes,5,opt,name=primary_impact,json=primaryImpact,proto3" json:"primary_impact,omitempty"`
@@ -346,7 +346,7 @@ func (x *Recommendation) GetRecommenderSubtype() string {
 	return ""
 }
 
-func (x *Recommendation) GetLastRefreshTime() *timestamp.Timestamp {
+func (x *Recommendation) GetLastRefreshTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastRefreshTime
 	}
@@ -420,7 +420,7 @@ type RecommendationContent struct {
 	// atomically and in an order.
 	OperationGroups []*OperationGroup `protobuf:"bytes,2,rep,name=operation_groups,json=operationGroups,proto3" json:"operation_groups,omitempty"`
 	// Condensed overview information about the recommendation.
-	Overview *_struct.Struct `protobuf:"bytes,3,opt,name=overview,proto3" json:"overview,omitempty"`
+	Overview *structpb.Struct `protobuf:"bytes,3,opt,name=overview,proto3" json:"overview,omitempty"`
 }
 
 func (x *RecommendationContent) Reset() {
@@ -462,7 +462,7 @@ func (x *RecommendationContent) GetOperationGroups() []*OperationGroup {
 	return nil
 }
 
-func (x *RecommendationContent) GetOverview() *_struct.Struct {
+func (x *RecommendationContent) GetOverview() *structpb.Struct {
 	if x != nil {
 		return x.Overview
 	}
@@ -600,7 +600,7 @@ type Operation struct {
 	// ```
 	// When both path_filters and path_value_matchers are set, an implicit AND
 	// must be performed.
-	PathFilters map[string]*_struct.Value `protobuf:"bytes,8,rep,name=path_filters,json=pathFilters,proto3" json:"path_filters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	PathFilters map[string]*structpb.Value `protobuf:"bytes,8,rep,name=path_filters,json=pathFilters,proto3" json:"path_filters,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Similar to path_filters, this contains set of filters to apply if `path`
 	// field refers to array elements. This is meant to support value matching
 	// beyond exact match. To perform exact match, use path_filters.
@@ -690,7 +690,7 @@ func (m *Operation) GetPathValue() isOperation_PathValue {
 	return nil
 }
 
-func (x *Operation) GetValue() *_struct.Value {
+func (x *Operation) GetValue() *structpb.Value {
 	if x, ok := x.GetPathValue().(*Operation_Value); ok {
 		return x.Value
 	}
@@ -704,7 +704,7 @@ func (x *Operation) GetValueMatcher() *ValueMatcher {
 	return nil
 }
 
-func (x *Operation) GetPathFilters() map[string]*_struct.Value {
+func (x *Operation) GetPathFilters() map[string]*structpb.Value {
 	if x != nil {
 		return x.PathFilters
 	}
@@ -726,7 +726,7 @@ type Operation_Value struct {
 	// Value for the `path` field. Will be set for actions:'add'/'replace'.
 	// Maybe set for action: 'test'. Either this or `value_matcher` will be set
 	// for 'test' operation. An exact match must be performed.
-	Value *_struct.Value `protobuf:"bytes,7,opt,name=value,proto3,oneof"`
+	Value *structpb.Value `protobuf:"bytes,7,opt,name=value,proto3,oneof"`
 }
 
 type Operation_ValueMatcher struct {
@@ -824,7 +824,7 @@ type CostProjection struct {
 	// prices or custom contract prices.
 	Cost *money.Money `protobuf:"bytes,1,opt,name=cost,proto3" json:"cost,omitempty"`
 	// Duration for which this cost applies.
-	Duration *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
 }
 
 func (x *CostProjection) Reset() {
@@ -866,7 +866,7 @@ func (x *CostProjection) GetCost() *money.Money {
 	return nil
 }
 
-func (x *CostProjection) GetDuration() *duration.Duration {
+func (x *CostProjection) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -880,7 +880,7 @@ type SecurityProjection struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Additional security impact details that is provided by the recommender.
-	Details *_struct.Struct `protobuf:"bytes,2,opt,name=details,proto3" json:"details,omitempty"`
+	Details *structpb.Struct `protobuf:"bytes,2,opt,name=details,proto3" json:"details,omitempty"`
 }
 
 func (x *SecurityProjection) Reset() {
@@ -915,7 +915,7 @@ func (*SecurityProjection) Descriptor() ([]byte, []int) {
 	return file_google_cloud_recommender_v1_recommendation_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *SecurityProjection) GetDetails() *_struct.Struct {
+func (x *SecurityProjection) GetDetails() *structpb.Struct {
 	if x != nil {
 		return x.Details
 	}
@@ -1418,11 +1418,11 @@ var file_google_cloud_recommender_v1_recommendation_proto_goTypes = []interface{
 	nil,                                     // 13: google.cloud.recommender.v1.Operation.PathFiltersEntry
 	nil,                                     // 14: google.cloud.recommender.v1.Operation.PathValueMatchersEntry
 	nil,                                     // 15: google.cloud.recommender.v1.RecommendationStateInfo.StateMetadataEntry
-	(*timestamp.Timestamp)(nil),             // 16: google.protobuf.Timestamp
-	(*_struct.Struct)(nil),                  // 17: google.protobuf.Struct
-	(*_struct.Value)(nil),                   // 18: google.protobuf.Value
+	(*timestamppb.Timestamp)(nil),           // 16: google.protobuf.Timestamp
+	(*structpb.Struct)(nil),                 // 17: google.protobuf.Struct
+	(*structpb.Value)(nil),                  // 18: google.protobuf.Value
 	(*money.Money)(nil),                     // 19: google.type.Money
-	(*duration.Duration)(nil),               // 20: google.protobuf.Duration
+	(*durationpb.Duration)(nil),             // 20: google.protobuf.Duration
 }
 var file_google_cloud_recommender_v1_recommendation_proto_depIdxs = []int32{
 	16, // 0: google.cloud.recommender.v1.Recommendation.last_refresh_time:type_name -> google.protobuf.Timestamp
diff --git a/recommender/apiv1/recommenderpb/recommender_config.pb.go b/recommender/apiv1/recommenderpb/recommender_config.pb.go
index 211b87ee75b..64ad2f6939e 100644
--- a/recommender/apiv1/recommenderpb/recommender_config.pb.go
+++ b/recommender/apiv1/recommenderpb/recommender_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/recommender/v1/recommender_config.proto
 
 package recommenderpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -55,7 +55,7 @@ type RecommenderConfig struct {
 	// updating.
 	Etag string `protobuf:"bytes,3,opt,name=etag,proto3" json:"etag,omitempty"`
 	// Last time when the config was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Immutable. The revision ID of the config.
 	// A new revision is committed whenever the config is changed in any way.
 	// The format is an 8-character hexadecimal string.
@@ -127,7 +127,7 @@ func (x *RecommenderConfig) GetEtag() string {
 	return ""
 }
 
-func (x *RecommenderConfig) GetUpdateTime() *timestamp.Timestamp {
+func (x *RecommenderConfig) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -165,7 +165,7 @@ type RecommenderGenerationConfig struct {
 
 	// Parameters for this RecommenderGenerationConfig. These configs can be used
 	// by or are applied to all subtypes.
-	Params *_struct.Struct `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"`
+	Params *structpb.Struct `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"`
 }
 
 func (x *RecommenderGenerationConfig) Reset() {
@@ -200,7 +200,7 @@ func (*RecommenderGenerationConfig) Descriptor() ([]byte, []int) {
 	return file_google_cloud_recommender_v1_recommender_config_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *RecommenderGenerationConfig) GetParams() *_struct.Struct {
+func (x *RecommenderGenerationConfig) GetParams() *structpb.Struct {
 	if x != nil {
 		return x.Params
 	}
@@ -302,8 +302,8 @@ var file_google_cloud_recommender_v1_recommender_config_proto_goTypes = []interf
 	(*RecommenderConfig)(nil),           // 0: google.cloud.recommender.v1.RecommenderConfig
 	(*RecommenderGenerationConfig)(nil), // 1: google.cloud.recommender.v1.RecommenderGenerationConfig
 	nil,                                 // 2: google.cloud.recommender.v1.RecommenderConfig.AnnotationsEntry
-	(*timestamp.Timestamp)(nil),         // 3: google.protobuf.Timestamp
-	(*_struct.Struct)(nil),              // 4: google.protobuf.Struct
+	(*timestamppb.Timestamp)(nil),       // 3: google.protobuf.Timestamp
+	(*structpb.Struct)(nil),             // 4: google.protobuf.Struct
 }
 var file_google_cloud_recommender_v1_recommender_config_proto_depIdxs = []int32{
 	1, // 0: google.cloud.recommender.v1.RecommenderConfig.recommender_generation_config:type_name -> google.cloud.recommender.v1.RecommenderGenerationConfig
diff --git a/recommender/apiv1/recommenderpb/recommender_service.pb.go b/recommender/apiv1/recommenderpb/recommender_service.pb.go
index 57611c9cf9a..5d6c48770ba 100644
--- a/recommender/apiv1/recommenderpb/recommender_service.pb.go
+++ b/recommender/apiv1/recommenderpb/recommender_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/recommender/v1/recommender_service.proto
 
 package recommenderpb
@@ -26,12 +26,12 @@ import (
 	sync "sync"
 
 	_ "google.golang.org/genproto/googleapis/api/annotations"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -835,7 +835,7 @@ type UpdateRecommenderConfigRequest struct {
 	// Required. The RecommenderConfig to update.
 	RecommenderConfig *RecommenderConfig `protobuf:"bytes,1,opt,name=recommender_config,json=recommenderConfig,proto3" json:"recommender_config,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// If true, validate the request and preview the change, but do not actually
 	// update it.
 	ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
@@ -880,7 +880,7 @@ func (x *UpdateRecommenderConfigRequest) GetRecommenderConfig() *RecommenderConf
 	return nil
 }
 
-func (x *UpdateRecommenderConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateRecommenderConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -960,7 +960,7 @@ type UpdateInsightTypeConfigRequest struct {
 	// Required. The InsightTypeConfig to update.
 	InsightTypeConfig *InsightTypeConfig `protobuf:"bytes,1,opt,name=insight_type_config,json=insightTypeConfig,proto3" json:"insight_type_config,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// If true, validate the request and preview the change, but do not actually
 	// update it.
 	ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
@@ -1005,7 +1005,7 @@ func (x *UpdateInsightTypeConfigRequest) GetInsightTypeConfig() *InsightTypeConf
 	return nil
 }
 
-func (x *UpdateInsightTypeConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateInsightTypeConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1593,7 +1593,7 @@ var file_google_cloud_recommender_v1_recommender_service_proto_goTypes = []inter
 	(*Insight)(nil),                            // 18: google.cloud.recommender.v1.Insight
 	(*Recommendation)(nil),                     // 19: google.cloud.recommender.v1.Recommendation
 	(*RecommenderConfig)(nil),                  // 20: google.cloud.recommender.v1.RecommenderConfig
-	(*field_mask.FieldMask)(nil),               // 21: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),              // 21: google.protobuf.FieldMask
 	(*InsightTypeConfig)(nil),                  // 22: google.cloud.recommender.v1.InsightTypeConfig
 }
 var file_google_cloud_recommender_v1_recommender_service_proto_depIdxs = []int32{
diff --git a/recommender/go.mod b/recommender/go.mod
index 7269ca12b36..763fab70914 100644
--- a/recommender/go.mod
+++ b/recommender/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/recommender/go.sum b/recommender/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/recommender/go.sum
+++ b/recommender/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/redis/apiv1/cloud_redis_client.go b/redis/apiv1/cloud_redis_client.go
index 02f2c43f147..5c46a08b9b6 100644
--- a/redis/apiv1/cloud_redis_client.go
+++ b/redis/apiv1/cloud_redis_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	redispb "cloud.google.com/go/redis/apiv1/redispb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	redispb "google.golang.org/genproto/googleapis/cloud/redis/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/redis/apiv1/cloud_redis_client_example_test.go b/redis/apiv1/cloud_redis_client_example_test.go
index a0bb9b95c75..7d3bc89b284 100644
--- a/redis/apiv1/cloud_redis_client_example_test.go
+++ b/redis/apiv1/cloud_redis_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	redis "cloud.google.com/go/redis/apiv1"
+	redispb "cloud.google.com/go/redis/apiv1/redispb"
 	"google.golang.org/api/iterator"
-	redispb "google.golang.org/genproto/googleapis/cloud/redis/v1"
 )
 
 func ExampleNewCloudRedisClient() {
@@ -56,7 +56,7 @@ func ExampleCloudRedisClient_ListInstances() {
 
 	req := &redispb.ListInstancesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#ListInstancesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#ListInstancesRequest.
 	}
 	it := c.ListInstances(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleCloudRedisClient_GetInstance() {
 
 	req := &redispb.GetInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#GetInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#GetInstanceRequest.
 	}
 	resp, err := c.GetInstance(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleCloudRedisClient_GetInstanceAuthString() {
 
 	req := &redispb.GetInstanceAuthStringRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#GetInstanceAuthStringRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#GetInstanceAuthStringRequest.
 	}
 	resp, err := c.GetInstanceAuthString(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleCloudRedisClient_CreateInstance() {
 
 	req := &redispb.CreateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#CreateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#CreateInstanceRequest.
 	}
 	op, err := c.CreateInstance(ctx, req)
 	if err != nil {
@@ -167,7 +167,7 @@ func ExampleCloudRedisClient_UpdateInstance() {
 
 	req := &redispb.UpdateInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#UpdateInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#UpdateInstanceRequest.
 	}
 	op, err := c.UpdateInstance(ctx, req)
 	if err != nil {
@@ -197,7 +197,7 @@ func ExampleCloudRedisClient_UpgradeInstance() {
 
 	req := &redispb.UpgradeInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#UpgradeInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#UpgradeInstanceRequest.
 	}
 	op, err := c.UpgradeInstance(ctx, req)
 	if err != nil {
@@ -227,7 +227,7 @@ func ExampleCloudRedisClient_ImportInstance() {
 
 	req := &redispb.ImportInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#ImportInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#ImportInstanceRequest.
 	}
 	op, err := c.ImportInstance(ctx, req)
 	if err != nil {
@@ -257,7 +257,7 @@ func ExampleCloudRedisClient_ExportInstance() {
 
 	req := &redispb.ExportInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#ExportInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#ExportInstanceRequest.
 	}
 	op, err := c.ExportInstance(ctx, req)
 	if err != nil {
@@ -287,7 +287,7 @@ func ExampleCloudRedisClient_FailoverInstance() {
 
 	req := &redispb.FailoverInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#FailoverInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#FailoverInstanceRequest.
 	}
 	op, err := c.FailoverInstance(ctx, req)
 	if err != nil {
@@ -317,7 +317,7 @@ func ExampleCloudRedisClient_DeleteInstance() {
 
 	req := &redispb.DeleteInstanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#DeleteInstanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#DeleteInstanceRequest.
 	}
 	op, err := c.DeleteInstance(ctx, req)
 	if err != nil {
@@ -345,7 +345,7 @@ func ExampleCloudRedisClient_RescheduleMaintenance() {
 
 	req := &redispb.RescheduleMaintenanceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#RescheduleMaintenanceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#RescheduleMaintenanceRequest.
 	}
 	op, err := c.RescheduleMaintenance(ctx, req)
 	if err != nil {
diff --git a/redis/apiv1/doc.go b/redis/apiv1/doc.go
index 1ba6b360141..fc4d789cb52 100644
--- a/redis/apiv1/doc.go
+++ b/redis/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &redispb.ListInstancesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/redis/v1#ListInstancesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/redis/apiv1/redispb#ListInstancesRequest.
 //	}
 //	it := c.ListInstances(ctx, req)
 //	for {
diff --git a/redis/apiv1/redispb/cloud_redis.pb.go b/redis/apiv1/redispb/cloud_redis.pb.go
index 3f44eefd6da..d0c20cb170a 100644
--- a/redis/apiv1/redispb/cloud_redis.pb.go
+++ b/redis/apiv1/redispb/cloud_redis.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/redis/v1/cloud_redis.proto
 
 package redispb
@@ -25,18 +25,18 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -582,7 +582,7 @@ type Instance struct {
 	// standard tier, this can be the zone of any node in the instance.
 	CurrentLocationId string `protobuf:"bytes,12,opt,name=current_location_id,json=currentLocationId,proto3" json:"current_location_id,omitempty"`
 	// Output only. The time the instance was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The current state of this instance.
 	State Instance_State `protobuf:"varint,14,opt,name=state,proto3,enum=google.cloud.redis.v1.Instance_State" json:"state,omitempty"`
 	// Output only. Additional information about the current status of this
@@ -771,7 +771,7 @@ func (x *Instance) GetCurrentLocationId() string {
 	return ""
 }
 
-func (x *Instance) GetCreateTime() *timestamp.Timestamp {
+func (x *Instance) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -921,7 +921,7 @@ type RescheduleMaintenanceRequest struct {
 	// Optional. Timestamp when the maintenance shall be rescheduled to if
 	// reschedule_type=SPECIFIC_TIME, in RFC 3339 format, for
 	// example `2012-11-15T16:19:00.094Z`.
-	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	ScheduleTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
 }
 
 func (x *RescheduleMaintenanceRequest) Reset() {
@@ -970,7 +970,7 @@ func (x *RescheduleMaintenanceRequest) GetRescheduleType() RescheduleMaintenance
 	return RescheduleMaintenanceRequest_RESCHEDULE_TYPE_UNSPECIFIED
 }
 
-func (x *RescheduleMaintenanceRequest) GetScheduleTime() *timestamp.Timestamp {
+func (x *RescheduleMaintenanceRequest) GetScheduleTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ScheduleTime
 	}
@@ -984,9 +984,9 @@ type MaintenancePolicy struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time when the policy was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the policy was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Description of what this policy is for. Create/Update methods
 	// return INVALID_ARGUMENT if the length is greater than 512.
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
@@ -1028,14 +1028,14 @@ func (*MaintenancePolicy) Descriptor() ([]byte, []int) {
 	return file_google_cloud_redis_v1_cloud_redis_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *MaintenancePolicy) GetCreateTime() *timestamp.Timestamp {
+func (x *MaintenancePolicy) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *MaintenancePolicy) GetUpdateTime() *timestamp.Timestamp {
+func (x *MaintenancePolicy) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1068,7 +1068,7 @@ type WeeklyMaintenanceWindow struct {
 	// Required. Start time of the window in UTC time.
 	StartTime *timeofday.TimeOfDay `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. Duration of the maintenance window. The current window is fixed at 1 hour.
-	Duration *duration.Duration `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"`
 }
 
 func (x *WeeklyMaintenanceWindow) Reset() {
@@ -1117,7 +1117,7 @@ func (x *WeeklyMaintenanceWindow) GetStartTime() *timeofday.TimeOfDay {
 	return nil
 }
 
-func (x *WeeklyMaintenanceWindow) GetDuration() *duration.Duration {
+func (x *WeeklyMaintenanceWindow) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -1132,16 +1132,16 @@ type MaintenanceSchedule struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The start time of any upcoming scheduled maintenance for this instance.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. The end time of any upcoming scheduled maintenance for this instance.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// If the scheduled maintenance can be rescheduled, default is true.
 	//
 	// Deprecated: Do not use.
 	CanReschedule bool `protobuf:"varint,3,opt,name=can_reschedule,json=canReschedule,proto3" json:"can_reschedule,omitempty"`
 	// Output only. The deadline that the maintenance schedule start time can not go beyond,
 	// including reschedule.
-	ScheduleDeadlineTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=schedule_deadline_time,json=scheduleDeadlineTime,proto3" json:"schedule_deadline_time,omitempty"`
+	ScheduleDeadlineTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=schedule_deadline_time,json=scheduleDeadlineTime,proto3" json:"schedule_deadline_time,omitempty"`
 }
 
 func (x *MaintenanceSchedule) Reset() {
@@ -1176,14 +1176,14 @@ func (*MaintenanceSchedule) Descriptor() ([]byte, []int) {
 	return file_google_cloud_redis_v1_cloud_redis_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *MaintenanceSchedule) GetStartTime() *timestamp.Timestamp {
+func (x *MaintenanceSchedule) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *MaintenanceSchedule) GetEndTime() *timestamp.Timestamp {
+func (x *MaintenanceSchedule) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1198,7 +1198,7 @@ func (x *MaintenanceSchedule) GetCanReschedule() bool {
 	return false
 }
 
-func (x *MaintenanceSchedule) GetScheduleDeadlineTime() *timestamp.Timestamp {
+func (x *MaintenanceSchedule) GetScheduleDeadlineTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ScheduleDeadlineTime
 	}
@@ -1609,7 +1609,7 @@ type UpdateInstanceRequest struct {
 	//   - `memorySizeGb`
 	//   - `redisConfig`
 	//   - `replica_count`
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. Update description.
 	// Only fields specified in update_mask are updated.
 	Instance *Instance `protobuf:"bytes,2,opt,name=instance,proto3" json:"instance,omitempty"`
@@ -1647,7 +1647,7 @@ func (*UpdateInstanceRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_redis_v1_cloud_redis_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *UpdateInstanceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateInstanceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2211,9 +2211,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Creation timestamp.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// End timestamp.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Operation target.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Operation verb.
@@ -2258,14 +2258,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_redis_v1_cloud_redis_proto_rawDescGZIP(), []int{22}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2415,11 +2415,11 @@ type TlsCertificate struct {
 	// Output only. The time when the certificate was created in [RFC
 	// 3339](https://tools.ietf.org/html/rfc3339) format, for example
 	// `2020-05-18T00:00:00.094Z`.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time when the certificate expires in [RFC
 	// 3339](https://tools.ietf.org/html/rfc3339) format, for example
 	// `2020-05-18T00:00:00.094Z`.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// Sha1 Fingerprint of the certificate.
 	Sha1Fingerprint string `protobuf:"bytes,5,opt,name=sha1_fingerprint,json=sha1Fingerprint,proto3" json:"sha1_fingerprint,omitempty"`
 }
@@ -2470,14 +2470,14 @@ func (x *TlsCertificate) GetCert() string {
 	return ""
 }
 
-func (x *TlsCertificate) GetCreateTime() *timestamp.Timestamp {
+func (x *TlsCertificate) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *TlsCertificate) GetExpireTime() *timestamp.Timestamp {
+func (x *TlsCertificate) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -3156,11 +3156,11 @@ var file_google_cloud_redis_v1_cloud_redis_proto_goTypes = []interface{}{
 	nil,                                              // 33: google.cloud.redis.v1.Instance.LabelsEntry
 	nil,                                              // 34: google.cloud.redis.v1.Instance.RedisConfigsEntry
 	nil,                                              // 35: google.cloud.redis.v1.LocationMetadata.AvailableZonesEntry
-	(*timestamp.Timestamp)(nil),                      // 36: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                    // 36: google.protobuf.Timestamp
 	(dayofweek.DayOfWeek)(0),                         // 37: google.type.DayOfWeek
 	(*timeofday.TimeOfDay)(nil),                      // 38: google.type.TimeOfDay
-	(*duration.Duration)(nil),                        // 39: google.protobuf.Duration
-	(*field_mask.FieldMask)(nil),                     // 40: google.protobuf.FieldMask
+	(*durationpb.Duration)(nil),                      // 39: google.protobuf.Duration
+	(*fieldmaskpb.FieldMask)(nil),                    // 40: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil),                    // 41: google.longrunning.Operation
 }
 var file_google_cloud_redis_v1_cloud_redis_proto_depIdxs = []int32{
diff --git a/redis/go.mod b/redis/go.mod
index 71afc286684..84ba4ac669c 100644
--- a/redis/go.mod
+++ b/redis/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/redis
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/redis/go.sum b/redis/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/redis/go.sum
+++ b/redis/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/resourcemanager/aliasshim/aliasshim.go b/resourcemanager/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/resourcemanager/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/resourcemanager/apiv2/doc.go b/resourcemanager/apiv2/doc.go
index 8a7928a8af3..2db1bb11ef1 100644
--- a/resourcemanager/apiv2/doc.go
+++ b/resourcemanager/apiv2/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &resourcemanagerpb.ListFoldersRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#ListFoldersRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#ListFoldersRequest.
 //	}
 //	it := c.ListFolders(ctx, req)
 //	for {
diff --git a/resourcemanager/apiv2/folders_client.go b/resourcemanager/apiv2/folders_client.go
index 8ef05f5fe20..40231993671 100644
--- a/resourcemanager/apiv2/folders_client.go
+++ b/resourcemanager/apiv2/folders_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v2"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/resourcemanager/apiv2/folders_client_example_test.go b/resourcemanager/apiv2/folders_client_example_test.go
index c4d276cec6f..a6df37e5eb2 100644
--- a/resourcemanager/apiv2/folders_client_example_test.go
+++ b/resourcemanager/apiv2/folders_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	resourcemanager "cloud.google.com/go/resourcemanager/apiv2"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb"
 	"google.golang.org/api/iterator"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v2"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleFoldersClient_ListFolders() {
 
 	req := &resourcemanagerpb.ListFoldersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#ListFoldersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#ListFoldersRequest.
 	}
 	it := c.ListFolders(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleFoldersClient_SearchFolders() {
 
 	req := &resourcemanagerpb.SearchFoldersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#SearchFoldersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#SearchFoldersRequest.
 	}
 	it := c.SearchFolders(ctx, req)
 	for {
@@ -119,7 +119,7 @@ func ExampleFoldersClient_GetFolder() {
 
 	req := &resourcemanagerpb.GetFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#GetFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#GetFolderRequest.
 	}
 	resp, err := c.GetFolder(ctx, req)
 	if err != nil {
@@ -144,7 +144,7 @@ func ExampleFoldersClient_CreateFolder() {
 
 	req := &resourcemanagerpb.CreateFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#CreateFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#CreateFolderRequest.
 	}
 	op, err := c.CreateFolder(ctx, req)
 	if err != nil {
@@ -174,7 +174,7 @@ func ExampleFoldersClient_UpdateFolder() {
 
 	req := &resourcemanagerpb.UpdateFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#UpdateFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#UpdateFolderRequest.
 	}
 	resp, err := c.UpdateFolder(ctx, req)
 	if err != nil {
@@ -199,7 +199,7 @@ func ExampleFoldersClient_MoveFolder() {
 
 	req := &resourcemanagerpb.MoveFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#MoveFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#MoveFolderRequest.
 	}
 	op, err := c.MoveFolder(ctx, req)
 	if err != nil {
@@ -229,7 +229,7 @@ func ExampleFoldersClient_DeleteFolder() {
 
 	req := &resourcemanagerpb.DeleteFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#DeleteFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#DeleteFolderRequest.
 	}
 	resp, err := c.DeleteFolder(ctx, req)
 	if err != nil {
@@ -254,7 +254,7 @@ func ExampleFoldersClient_UndeleteFolder() {
 
 	req := &resourcemanagerpb.UndeleteFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v2#UndeleteFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv2/resourcemanagerpb#UndeleteFolderRequest.
 	}
 	resp, err := c.UndeleteFolder(ctx, req)
 	if err != nil {
diff --git a/resourcemanager/apiv2/resourcemanagerpb/folders.pb.go b/resourcemanager/apiv2/resourcemanagerpb/folders.pb.go
index 4df6aab442f..66b6be7e991 100644
--- a/resourcemanager/apiv2/resourcemanagerpb/folders.pb.go
+++ b/resourcemanager/apiv2/resourcemanagerpb/folders.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/resourcemanager/v2/folders.proto
 
 package resourcemanagerpb
@@ -26,16 +26,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -179,9 +179,9 @@ type Folder struct {
 	// [UndeleteFolder][google.cloud.resourcemanager.v2.Folders.UndeleteFolder].
 	LifecycleState Folder_LifecycleState `protobuf:"varint,4,opt,name=lifecycle_state,json=lifecycleState,proto3,enum=google.cloud.resourcemanager.v2.Folder_LifecycleState" json:"lifecycle_state,omitempty"`
 	// Output only. Timestamp when the Folder was created. Assigned by the server.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp when the Folder was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *Folder) Reset() {
@@ -244,14 +244,14 @@ func (x *Folder) GetLifecycleState() Folder_LifecycleState {
 	return Folder_LIFECYCLE_STATE_UNSPECIFIED
 }
 
-func (x *Folder) GetCreateTime() *timestamp.Timestamp {
+func (x *Folder) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Folder) GetUpdateTime() *timestamp.Timestamp {
+func (x *Folder) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -734,7 +734,7 @@ type UpdateFolderRequest struct {
 	Folder *Folder `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder,omitempty"`
 	// Required. Fields to be updated.
 	// Only the `display_name` can be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateFolderRequest) Reset() {
@@ -776,7 +776,7 @@ func (x *UpdateFolderRequest) GetFolder() *Folder {
 	return nil
 }
 
-func (x *UpdateFolderRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateFolderRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1297,8 +1297,8 @@ var file_google_cloud_resourcemanager_v2_folders_proto_goTypes = []interface{}{
 	(*DeleteFolderRequest)(nil),           // 11: google.cloud.resourcemanager.v2.DeleteFolderRequest
 	(*UndeleteFolderRequest)(nil),         // 12: google.cloud.resourcemanager.v2.UndeleteFolderRequest
 	(*FolderOperation)(nil),               // 13: google.cloud.resourcemanager.v2.FolderOperation
-	(*timestamp.Timestamp)(nil),           // 14: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),          // 15: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),         // 14: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),         // 15: google.protobuf.FieldMask
 	(*v1.GetIamPolicyRequest)(nil),        // 16: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 17: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 18: google.iam.v1.TestIamPermissionsRequest
diff --git a/resourcemanager/apiv3/doc.go b/resourcemanager/apiv3/doc.go
index 451d0b197f7..2fd178c615c 100644
--- a/resourcemanager/apiv3/doc.go
+++ b/resourcemanager/apiv3/doc.go
@@ -60,7 +60,7 @@
 //
 //	req := &resourcemanagerpb.GetFolderRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#GetFolderRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#GetFolderRequest.
 //	}
 //	resp, err := c.GetFolder(ctx, req)
 //	if err != nil {
diff --git a/resourcemanager/apiv3/folders_client.go b/resourcemanager/apiv3/folders_client.go
index 1886de7d503..815f64f78cb 100644
--- a/resourcemanager/apiv3/folders_client.go
+++ b/resourcemanager/apiv3/folders_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/resourcemanager/apiv3/folders_client_example_test.go b/resourcemanager/apiv3/folders_client_example_test.go
index b842b74817c..1d9a29208f3 100644
--- a/resourcemanager/apiv3/folders_client_example_test.go
+++ b/resourcemanager/apiv3/folders_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	resourcemanager "cloud.google.com/go/resourcemanager/apiv3"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	"google.golang.org/api/iterator"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleFoldersClient_GetFolder() {
 
 	req := &resourcemanagerpb.GetFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#GetFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#GetFolderRequest.
 	}
 	resp, err := c.GetFolder(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleFoldersClient_ListFolders() {
 
 	req := &resourcemanagerpb.ListFoldersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#ListFoldersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#ListFoldersRequest.
 	}
 	it := c.ListFolders(ctx, req)
 	for {
@@ -113,7 +113,7 @@ func ExampleFoldersClient_SearchFolders() {
 
 	req := &resourcemanagerpb.SearchFoldersRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#SearchFoldersRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#SearchFoldersRequest.
 	}
 	it := c.SearchFolders(ctx, req)
 	for {
@@ -144,7 +144,7 @@ func ExampleFoldersClient_CreateFolder() {
 
 	req := &resourcemanagerpb.CreateFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#CreateFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#CreateFolderRequest.
 	}
 	op, err := c.CreateFolder(ctx, req)
 	if err != nil {
@@ -174,7 +174,7 @@ func ExampleFoldersClient_UpdateFolder() {
 
 	req := &resourcemanagerpb.UpdateFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#UpdateFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#UpdateFolderRequest.
 	}
 	op, err := c.UpdateFolder(ctx, req)
 	if err != nil {
@@ -204,7 +204,7 @@ func ExampleFoldersClient_MoveFolder() {
 
 	req := &resourcemanagerpb.MoveFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#MoveFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#MoveFolderRequest.
 	}
 	op, err := c.MoveFolder(ctx, req)
 	if err != nil {
@@ -234,7 +234,7 @@ func ExampleFoldersClient_DeleteFolder() {
 
 	req := &resourcemanagerpb.DeleteFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#DeleteFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#DeleteFolderRequest.
 	}
 	op, err := c.DeleteFolder(ctx, req)
 	if err != nil {
@@ -264,7 +264,7 @@ func ExampleFoldersClient_UndeleteFolder() {
 
 	req := &resourcemanagerpb.UndeleteFolderRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#UndeleteFolderRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#UndeleteFolderRequest.
 	}
 	op, err := c.UndeleteFolder(ctx, req)
 	if err != nil {
diff --git a/resourcemanager/apiv3/organizations_client.go b/resourcemanager/apiv3/organizations_client.go
index 06dcffa8a19..386d1991c5c 100644
--- a/resourcemanager/apiv3/organizations_client.go
+++ b/resourcemanager/apiv3/organizations_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/resourcemanager/apiv3/organizations_client_example_test.go b/resourcemanager/apiv3/organizations_client_example_test.go
index 656411f21ae..e2f18d7ef86 100644
--- a/resourcemanager/apiv3/organizations_client_example_test.go
+++ b/resourcemanager/apiv3/organizations_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	resourcemanager "cloud.google.com/go/resourcemanager/apiv3"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	"google.golang.org/api/iterator"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleOrganizationsClient_GetOrganization() {
 
 	req := &resourcemanagerpb.GetOrganizationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#GetOrganizationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#GetOrganizationRequest.
 	}
 	resp, err := c.GetOrganization(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleOrganizationsClient_SearchOrganizations() {
 
 	req := &resourcemanagerpb.SearchOrganizationsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#SearchOrganizationsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#SearchOrganizationsRequest.
 	}
 	it := c.SearchOrganizations(ctx, req)
 	for {
diff --git a/resourcemanager/apiv3/projects_client.go b/resourcemanager/apiv3/projects_client.go
index a94b3f66393..87a2a09efca 100644
--- a/resourcemanager/apiv3/projects_client.go
+++ b/resourcemanager/apiv3/projects_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/resourcemanager/apiv3/projects_client_example_test.go b/resourcemanager/apiv3/projects_client_example_test.go
index b3929df96d3..aade857a910 100644
--- a/resourcemanager/apiv3/projects_client_example_test.go
+++ b/resourcemanager/apiv3/projects_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	resourcemanager "cloud.google.com/go/resourcemanager/apiv3"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	"google.golang.org/api/iterator"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleProjectsClient_GetProject() {
 
 	req := &resourcemanagerpb.GetProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#GetProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#GetProjectRequest.
 	}
 	resp, err := c.GetProject(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleProjectsClient_ListProjects() {
 
 	req := &resourcemanagerpb.ListProjectsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#ListProjectsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#ListProjectsRequest.
 	}
 	it := c.ListProjects(ctx, req)
 	for {
@@ -113,7 +113,7 @@ func ExampleProjectsClient_SearchProjects() {
 
 	req := &resourcemanagerpb.SearchProjectsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#SearchProjectsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#SearchProjectsRequest.
 	}
 	it := c.SearchProjects(ctx, req)
 	for {
@@ -144,7 +144,7 @@ func ExampleProjectsClient_CreateProject() {
 
 	req := &resourcemanagerpb.CreateProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#CreateProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#CreateProjectRequest.
 	}
 	op, err := c.CreateProject(ctx, req)
 	if err != nil {
@@ -174,7 +174,7 @@ func ExampleProjectsClient_UpdateProject() {
 
 	req := &resourcemanagerpb.UpdateProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#UpdateProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#UpdateProjectRequest.
 	}
 	op, err := c.UpdateProject(ctx, req)
 	if err != nil {
@@ -204,7 +204,7 @@ func ExampleProjectsClient_MoveProject() {
 
 	req := &resourcemanagerpb.MoveProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#MoveProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#MoveProjectRequest.
 	}
 	op, err := c.MoveProject(ctx, req)
 	if err != nil {
@@ -234,7 +234,7 @@ func ExampleProjectsClient_DeleteProject() {
 
 	req := &resourcemanagerpb.DeleteProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#DeleteProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#DeleteProjectRequest.
 	}
 	op, err := c.DeleteProject(ctx, req)
 	if err != nil {
@@ -264,7 +264,7 @@ func ExampleProjectsClient_UndeleteProject() {
 
 	req := &resourcemanagerpb.UndeleteProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#UndeleteProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#UndeleteProjectRequest.
 	}
 	op, err := c.UndeleteProject(ctx, req)
 	if err != nil {
diff --git a/resourcemanager/apiv3/resourcemanagerpb/folders.pb.go b/resourcemanager/apiv3/resourcemanagerpb/folders.pb.go
index b8c3c57d0e6..0879424222d 100644
--- a/resourcemanager/apiv3/resourcemanagerpb/folders.pb.go
+++ b/resourcemanager/apiv3/resourcemanagerpb/folders.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/resourcemanager/v3/folders.proto
 
 package resourcemanagerpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -125,11 +125,11 @@ type Folder struct {
 	// [UndeleteFolder][google.cloud.resourcemanager.v3.Folders.UndeleteFolder].
 	State Folder_State `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.resourcemanager.v3.Folder_State" json:"state,omitempty"`
 	// Output only. Timestamp when the folder was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp when the folder was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Timestamp when the folder was requested to be deleted.
-	DeleteTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
+	DeleteTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
 	// Output only. A checksum computed by the server based on the current value of the folder
 	// resource. This may be sent on update and delete requests to ensure the
 	// client has an up-to-date value before proceeding.
@@ -196,21 +196,21 @@ func (x *Folder) GetState() Folder_State {
 	return Folder_STATE_UNSPECIFIED
 }
 
-func (x *Folder) GetCreateTime() *timestamp.Timestamp {
+func (x *Folder) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Folder) GetUpdateTime() *timestamp.Timestamp {
+func (x *Folder) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Folder) GetDeleteTime() *timestamp.Timestamp {
+func (x *Folder) GetDeleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeleteTime
 	}
@@ -704,7 +704,7 @@ type UpdateFolderRequest struct {
 	Folder *Folder `protobuf:"bytes,1,opt,name=folder,proto3" json:"folder,omitempty"`
 	// Required. Fields to be updated.
 	// Only the `display_name` can be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateFolderRequest) Reset() {
@@ -746,7 +746,7 @@ func (x *UpdateFolderRequest) GetFolder() *Folder {
 	return nil
 }
 
-func (x *UpdateFolderRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateFolderRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1432,8 +1432,8 @@ var file_google_cloud_resourcemanager_v3_folders_proto_goTypes = []interface{}{
 	(*DeleteFolderMetadata)(nil),          // 14: google.cloud.resourcemanager.v3.DeleteFolderMetadata
 	(*UndeleteFolderRequest)(nil),         // 15: google.cloud.resourcemanager.v3.UndeleteFolderRequest
 	(*UndeleteFolderMetadata)(nil),        // 16: google.cloud.resourcemanager.v3.UndeleteFolderMetadata
-	(*timestamp.Timestamp)(nil),           // 17: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),          // 18: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),         // 17: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),         // 18: google.protobuf.FieldMask
 	(*v1.GetIamPolicyRequest)(nil),        // 19: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 20: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 21: google.iam.v1.TestIamPermissionsRequest
diff --git a/resourcemanager/apiv3/resourcemanagerpb/organizations.pb.go b/resourcemanager/apiv3/resourcemanagerpb/organizations.pb.go
index 1fe589d1575..a03447c5376 100644
--- a/resourcemanager/apiv3/resourcemanagerpb/organizations.pb.go
+++ b/resourcemanager/apiv3/resourcemanagerpb/organizations.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/resourcemanager/v3/organizations.proto
 
 package resourcemanagerpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -125,11 +125,11 @@ type Organization struct {
 	// Output only. The organization's current lifecycle state.
 	State Organization_State `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.resourcemanager.v3.Organization_State" json:"state,omitempty"`
 	// Output only. Timestamp when the Organization was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Timestamp when the Organization was last modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Timestamp when the Organization was requested for deletion.
-	DeleteTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
+	DeleteTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
 	// Output only. A checksum computed by the server based on the current value of the
 	// Organization resource. This may be sent on update and delete requests to
 	// ensure the client has an up-to-date value before proceeding.
@@ -203,21 +203,21 @@ func (x *Organization) GetState() Organization_State {
 	return Organization_STATE_UNSPECIFIED
 }
 
-func (x *Organization) GetCreateTime() *timestamp.Timestamp {
+func (x *Organization) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Organization) GetUpdateTime() *timestamp.Timestamp {
+func (x *Organization) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Organization) GetDeleteTime() *timestamp.Timestamp {
+func (x *Organization) GetDeleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeleteTime
 	}
@@ -713,7 +713,7 @@ var file_google_cloud_resourcemanager_v3_organizations_proto_goTypes = []interfa
 	(*SearchOrganizationsResponse)(nil),   // 4: google.cloud.resourcemanager.v3.SearchOrganizationsResponse
 	(*DeleteOrganizationMetadata)(nil),    // 5: google.cloud.resourcemanager.v3.DeleteOrganizationMetadata
 	(*UndeleteOrganizationMetadata)(nil),  // 6: google.cloud.resourcemanager.v3.UndeleteOrganizationMetadata
-	(*timestamp.Timestamp)(nil),           // 7: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),         // 7: google.protobuf.Timestamp
 	(*v1.GetIamPolicyRequest)(nil),        // 8: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 9: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 10: google.iam.v1.TestIamPermissionsRequest
diff --git a/resourcemanager/apiv3/resourcemanagerpb/projects.pb.go b/resourcemanager/apiv3/resourcemanagerpb/projects.pb.go
index 10265807db4..3b643d813fb 100644
--- a/resourcemanager/apiv3/resourcemanagerpb/projects.pb.go
+++ b/resourcemanager/apiv3/resourcemanagerpb/projects.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/resourcemanager/v3/projects.proto
 
 package resourcemanagerpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -136,11 +136,11 @@ type Project struct {
 	// Example: `My Project`
 	DisplayName string `protobuf:"bytes,5,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	// Output only. Creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The most recent time this resource was modified.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The time at which this resource was requested for deletion.
-	DeleteTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
+	DeleteTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
 	// Output only. A checksum computed by the server based on the current value of the Project
 	// resource. This may be sent on update and delete requests to ensure the
 	// client has an up-to-date value before proceeding.
@@ -229,21 +229,21 @@ func (x *Project) GetDisplayName() string {
 	return ""
 }
 
-func (x *Project) GetCreateTime() *timestamp.Timestamp {
+func (x *Project) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Project) GetUpdateTime() *timestamp.Timestamp {
+func (x *Project) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Project) GetDeleteTime() *timestamp.Timestamp {
+func (x *Project) GetDeleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeleteTime
 	}
@@ -732,7 +732,7 @@ type CreateProjectMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Creation time of the project creation workflow.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// True if the project can be retrieved using `GetProject`. No other
 	// operations on the project are guaranteed to work until the project creation
 	// is complete.
@@ -773,7 +773,7 @@ func (*CreateProjectMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_resourcemanager_v3_projects_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *CreateProjectMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *CreateProjectMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -809,7 +809,7 @@ type UpdateProjectRequest struct {
 	// Required. The new definition of the project.
 	Project *Project `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"`
 	// Optional. An update mask to selectively update fields.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateProjectRequest) Reset() {
@@ -851,7 +851,7 @@ func (x *UpdateProjectRequest) GetProject() *Project {
 	return nil
 }
 
-func (x *UpdateProjectRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateProjectRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1526,8 +1526,8 @@ var file_google_cloud_resourcemanager_v3_projects_proto_goTypes = []interface{}{
 	(*UndeleteProjectRequest)(nil),        // 15: google.cloud.resourcemanager.v3.UndeleteProjectRequest
 	(*UndeleteProjectMetadata)(nil),       // 16: google.cloud.resourcemanager.v3.UndeleteProjectMetadata
 	nil,                                   // 17: google.cloud.resourcemanager.v3.Project.LabelsEntry
-	(*timestamp.Timestamp)(nil),           // 18: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),          // 19: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),         // 18: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),         // 19: google.protobuf.FieldMask
 	(*v1.GetIamPolicyRequest)(nil),        // 20: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 21: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 22: google.iam.v1.TestIamPermissionsRequest
diff --git a/resourcemanager/apiv3/resourcemanagerpb/tag_bindings.pb.go b/resourcemanager/apiv3/resourcemanagerpb/tag_bindings.pb.go
index 24af8265067..5e15cf0a492 100644
--- a/resourcemanager/apiv3/resourcemanagerpb/tag_bindings.pb.go
+++ b/resourcemanager/apiv3/resourcemanagerpb/tag_bindings.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/resourcemanager/v3/tag_bindings.proto
 
 package resourcemanagerpb
diff --git a/resourcemanager/apiv3/resourcemanagerpb/tag_keys.pb.go b/resourcemanager/apiv3/resourcemanagerpb/tag_keys.pb.go
index f271c8c9d1b..63b12e7ac11 100644
--- a/resourcemanager/apiv3/resourcemanagerpb/tag_keys.pb.go
+++ b/resourcemanager/apiv3/resourcemanagerpb/tag_keys.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/resourcemanager/v3/tag_keys.proto
 
 package resourcemanagerpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -71,9 +71,9 @@ type TagKey struct {
 	// Read-write.
 	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. Creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Entity tag which users can pass to prevent race conditions. This field is
 	// always set in server responses. See UpdateTagKeyRequest for details.
 	Etag string `protobuf:"bytes,8,opt,name=etag,proto3" json:"etag,omitempty"`
@@ -146,14 +146,14 @@ func (x *TagKey) GetDescription() string {
 	return ""
 }
 
-func (x *TagKey) GetCreateTime() *timestamp.Timestamp {
+func (x *TagKey) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *TagKey) GetUpdateTime() *timestamp.Timestamp {
+func (x *TagKey) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -460,7 +460,7 @@ type UpdateTagKeyRequest struct {
 	// Fields to be updated. The mask may only contain `description` or
 	// `etag`. If omitted entirely, both `description` and `etag` are assumed to
 	// be significant.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Set as true to perform validations necessary for updating the resource, but
 	// not actually perform the action.
 	ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
@@ -505,7 +505,7 @@ func (x *UpdateTagKeyRequest) GetTagKey() *TagKey {
 	return nil
 }
 
-func (x *UpdateTagKeyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTagKeyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -911,8 +911,8 @@ var file_google_cloud_resourcemanager_v3_tag_keys_proto_goTypes = []interface{}{
 	(*UpdateTagKeyMetadata)(nil),          // 7: google.cloud.resourcemanager.v3.UpdateTagKeyMetadata
 	(*DeleteTagKeyRequest)(nil),           // 8: google.cloud.resourcemanager.v3.DeleteTagKeyRequest
 	(*DeleteTagKeyMetadata)(nil),          // 9: google.cloud.resourcemanager.v3.DeleteTagKeyMetadata
-	(*timestamp.Timestamp)(nil),           // 10: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),          // 11: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),         // 10: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),         // 11: google.protobuf.FieldMask
 	(*v1.GetIamPolicyRequest)(nil),        // 12: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 13: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 14: google.iam.v1.TestIamPermissionsRequest
diff --git a/resourcemanager/apiv3/resourcemanagerpb/tag_values.pb.go b/resourcemanager/apiv3/resourcemanagerpb/tag_values.pb.go
index cce3982f388..ea0e726651d 100644
--- a/resourcemanager/apiv3/resourcemanagerpb/tag_values.pb.go
+++ b/resourcemanager/apiv3/resourcemanagerpb/tag_values.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/resourcemanager/v3/tag_values.proto
 
 package resourcemanagerpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -72,9 +72,9 @@ type TagValue struct {
 	// Read-write.
 	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. Creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Entity tag which users can pass to prevent race conditions. This field is
 	// always set in server responses. See UpdateTagValueRequest for details.
 	Etag string `protobuf:"bytes,8,opt,name=etag,proto3" json:"etag,omitempty"`
@@ -147,14 +147,14 @@ func (x *TagValue) GetDescription() string {
 	return ""
 }
 
-func (x *TagValue) GetCreateTime() *timestamp.Timestamp {
+func (x *TagValue) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *TagValue) GetUpdateTime() *timestamp.Timestamp {
+func (x *TagValue) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -460,7 +460,7 @@ type UpdateTagValueRequest struct {
 	// `FAILED_PRECONDITION` will be returned.
 	TagValue *TagValue `protobuf:"bytes,1,opt,name=tag_value,json=tagValue,proto3" json:"tag_value,omitempty"`
 	// Optional. Fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. True to perform validations necessary for updating the resource, but not
 	// actually perform the action.
 	ValidateOnly bool `protobuf:"varint,3,opt,name=validate_only,json=validateOnly,proto3" json:"validate_only,omitempty"`
@@ -505,7 +505,7 @@ func (x *UpdateTagValueRequest) GetTagValue() *TagValue {
 	return nil
 }
 
-func (x *UpdateTagValueRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTagValueRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -917,8 +917,8 @@ var file_google_cloud_resourcemanager_v3_tag_values_proto_goTypes = []interface{
 	(*UpdateTagValueMetadata)(nil),        // 7: google.cloud.resourcemanager.v3.UpdateTagValueMetadata
 	(*DeleteTagValueRequest)(nil),         // 8: google.cloud.resourcemanager.v3.DeleteTagValueRequest
 	(*DeleteTagValueMetadata)(nil),        // 9: google.cloud.resourcemanager.v3.DeleteTagValueMetadata
-	(*timestamp.Timestamp)(nil),           // 10: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),          // 11: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),         // 10: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),         // 11: google.protobuf.FieldMask
 	(*v1.GetIamPolicyRequest)(nil),        // 12: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 13: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 14: google.iam.v1.TestIamPermissionsRequest
diff --git a/resourcemanager/apiv3/tag_bindings_client.go b/resourcemanager/apiv3/tag_bindings_client.go
index aa4a6ffdbbd..fa2496ac136 100644
--- a/resourcemanager/apiv3/tag_bindings_client.go
+++ b/resourcemanager/apiv3/tag_bindings_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/resourcemanager/apiv3/tag_bindings_client_example_test.go b/resourcemanager/apiv3/tag_bindings_client_example_test.go
index 0cf09e1ecaf..889f3dca0fc 100644
--- a/resourcemanager/apiv3/tag_bindings_client_example_test.go
+++ b/resourcemanager/apiv3/tag_bindings_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	resourcemanager "cloud.google.com/go/resourcemanager/apiv3"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	"google.golang.org/api/iterator"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 )
 
 func ExampleNewTagBindingsClient() {
@@ -56,7 +56,7 @@ func ExampleTagBindingsClient_ListTagBindings() {
 
 	req := &resourcemanagerpb.ListTagBindingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#ListTagBindingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#ListTagBindingsRequest.
 	}
 	it := c.ListTagBindings(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleTagBindingsClient_CreateTagBinding() {
 
 	req := &resourcemanagerpb.CreateTagBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#CreateTagBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#CreateTagBindingRequest.
 	}
 	op, err := c.CreateTagBinding(ctx, req)
 	if err != nil {
@@ -117,7 +117,7 @@ func ExampleTagBindingsClient_DeleteTagBinding() {
 
 	req := &resourcemanagerpb.DeleteTagBindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#DeleteTagBindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#DeleteTagBindingRequest.
 	}
 	op, err := c.DeleteTagBinding(ctx, req)
 	if err != nil {
diff --git a/resourcemanager/apiv3/tag_keys_client.go b/resourcemanager/apiv3/tag_keys_client.go
index f4458c6dac4..5488d88e0b3 100644
--- a/resourcemanager/apiv3/tag_keys_client.go
+++ b/resourcemanager/apiv3/tag_keys_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/resourcemanager/apiv3/tag_keys_client_example_test.go b/resourcemanager/apiv3/tag_keys_client_example_test.go
index f7dd1dac518..ba7b4285d56 100644
--- a/resourcemanager/apiv3/tag_keys_client_example_test.go
+++ b/resourcemanager/apiv3/tag_keys_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	resourcemanager "cloud.google.com/go/resourcemanager/apiv3"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	"google.golang.org/api/iterator"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleTagKeysClient_ListTagKeys() {
 
 	req := &resourcemanagerpb.ListTagKeysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#ListTagKeysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#ListTagKeysRequest.
 	}
 	it := c.ListTagKeys(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleTagKeysClient_GetTagKey() {
 
 	req := &resourcemanagerpb.GetTagKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#GetTagKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#GetTagKeyRequest.
 	}
 	resp, err := c.GetTagKey(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleTagKeysClient_CreateTagKey() {
 
 	req := &resourcemanagerpb.CreateTagKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#CreateTagKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#CreateTagKeyRequest.
 	}
 	op, err := c.CreateTagKey(ctx, req)
 	if err != nil {
@@ -143,7 +143,7 @@ func ExampleTagKeysClient_UpdateTagKey() {
 
 	req := &resourcemanagerpb.UpdateTagKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#UpdateTagKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#UpdateTagKeyRequest.
 	}
 	op, err := c.UpdateTagKey(ctx, req)
 	if err != nil {
@@ -173,7 +173,7 @@ func ExampleTagKeysClient_DeleteTagKey() {
 
 	req := &resourcemanagerpb.DeleteTagKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#DeleteTagKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#DeleteTagKeyRequest.
 	}
 	op, err := c.DeleteTagKey(ctx, req)
 	if err != nil {
diff --git a/resourcemanager/apiv3/tag_values_client.go b/resourcemanager/apiv3/tag_values_client.go
index fadf1cc1eb3..47005ca2a4d 100644
--- a/resourcemanager/apiv3/tag_values_client.go
+++ b/resourcemanager/apiv3/tag_values_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/resourcemanager/apiv3/tag_values_client_example_test.go b/resourcemanager/apiv3/tag_values_client_example_test.go
index 6a4b30f77bb..5d0bf4bc742 100644
--- a/resourcemanager/apiv3/tag_values_client_example_test.go
+++ b/resourcemanager/apiv3/tag_values_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	resourcemanager "cloud.google.com/go/resourcemanager/apiv3"
+	resourcemanagerpb "cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb"
 	"google.golang.org/api/iterator"
-	resourcemanagerpb "google.golang.org/genproto/googleapis/cloud/resourcemanager/v3"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleTagValuesClient_ListTagValues() {
 
 	req := &resourcemanagerpb.ListTagValuesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#ListTagValuesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#ListTagValuesRequest.
 	}
 	it := c.ListTagValues(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleTagValuesClient_GetTagValue() {
 
 	req := &resourcemanagerpb.GetTagValueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#GetTagValueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#GetTagValueRequest.
 	}
 	resp, err := c.GetTagValue(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleTagValuesClient_CreateTagValue() {
 
 	req := &resourcemanagerpb.CreateTagValueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#CreateTagValueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#CreateTagValueRequest.
 	}
 	op, err := c.CreateTagValue(ctx, req)
 	if err != nil {
@@ -143,7 +143,7 @@ func ExampleTagValuesClient_UpdateTagValue() {
 
 	req := &resourcemanagerpb.UpdateTagValueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#UpdateTagValueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#UpdateTagValueRequest.
 	}
 	op, err := c.UpdateTagValue(ctx, req)
 	if err != nil {
@@ -173,7 +173,7 @@ func ExampleTagValuesClient_DeleteTagValue() {
 
 	req := &resourcemanagerpb.DeleteTagValueRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcemanager/v3#DeleteTagValueRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcemanager/apiv3/resourcemanagerpb#DeleteTagValueRequest.
 	}
 	op, err := c.DeleteTagValue(ctx, req)
 	if err != nil {
diff --git a/resourcemanager/go.mod b/resourcemanager/go.mod
index fe10881037e..b2ac48cb83d 100644
--- a/resourcemanager/go.mod
+++ b/resourcemanager/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/resourcemanager
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/resourcemanager/go.sum b/resourcemanager/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/resourcemanager/go.sum
+++ b/resourcemanager/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/resourcesettings/aliasshim/aliasshim.go b/resourcesettings/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/resourcesettings/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/resourcesettings/apiv1/doc.go b/resourcesettings/apiv1/doc.go
index 0a88bf56d42..8436f662d64 100644
--- a/resourcesettings/apiv1/doc.go
+++ b/resourcesettings/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &resourcesettingspb.ListSettingsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcesettings/v1#ListSettingsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/resourcesettings/apiv1/resourcesettingspb#ListSettingsRequest.
 //	}
 //	it := c.ListSettings(ctx, req)
 //	for {
diff --git a/resourcesettings/apiv1/resource_settings_client.go b/resourcesettings/apiv1/resource_settings_client.go
index 5585cf4b677..c2a665fd832 100644
--- a/resourcesettings/apiv1/resource_settings_client.go
+++ b/resourcesettings/apiv1/resource_settings_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	resourcesettingspb "cloud.google.com/go/resourcesettings/apiv1/resourcesettingspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	resourcesettingspb "google.golang.org/genproto/googleapis/cloud/resourcesettings/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/resourcesettings/apiv1/resource_settings_client_example_test.go b/resourcesettings/apiv1/resource_settings_client_example_test.go
index ac0412a6599..de4d0900361 100644
--- a/resourcesettings/apiv1/resource_settings_client_example_test.go
+++ b/resourcesettings/apiv1/resource_settings_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	resourcesettings "cloud.google.com/go/resourcesettings/apiv1"
+	resourcesettingspb "cloud.google.com/go/resourcesettings/apiv1/resourcesettingspb"
 	"google.golang.org/api/iterator"
-	resourcesettingspb "google.golang.org/genproto/googleapis/cloud/resourcesettings/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListSettings() {
 
 	req := &resourcesettingspb.ListSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcesettings/v1#ListSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcesettings/apiv1/resourcesettingspb#ListSettingsRequest.
 	}
 	it := c.ListSettings(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetSetting() {
 
 	req := &resourcesettingspb.GetSettingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcesettings/v1#GetSettingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcesettings/apiv1/resourcesettingspb#GetSettingRequest.
 	}
 	resp, err := c.GetSetting(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_UpdateSetting() {
 
 	req := &resourcesettingspb.UpdateSettingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/resourcesettings/v1#UpdateSettingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/resourcesettings/apiv1/resourcesettingspb#UpdateSettingRequest.
 	}
 	resp, err := c.UpdateSetting(ctx, req)
 	if err != nil {
diff --git a/resourcesettings/apiv1/resourcesettingspb/resource_settings.pb.go b/resourcesettings/apiv1/resourcesettingspb/resource_settings.pb.go
index 06e03ff68d7..5dbf4fc167f 100644
--- a/resourcesettings/apiv1/resourcesettingspb/resource_settings.pb.go
+++ b/resourcesettings/apiv1/resourcesettingspb/resource_settings.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/resourcesettings/v1/resource_settings.proto
 
 package resourcesettingspb
diff --git a/resourcesettings/go.mod b/resourcesettings/go.mod
index 101b51a7e57..38f86e277da 100644
--- a/resourcesettings/go.mod
+++ b/resourcesettings/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/resourcesettings/go.sum b/resourcesettings/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/resourcesettings/go.sum
+++ b/resourcesettings/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/retail/apiv2/catalog_client.go b/retail/apiv2/catalog_client.go
index 9aef99b05c5..fd9289316ce 100644
--- a/retail/apiv2/catalog_client.go
+++ b/retail/apiv2/catalog_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/retail/apiv2/catalog_client_example_test.go b/retail/apiv2/catalog_client_example_test.go
index 0c91b5c069c..2e06f2fc2d2 100644
--- a/retail/apiv2/catalog_client_example_test.go
+++ b/retail/apiv2/catalog_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	retail "cloud.google.com/go/retail/apiv2"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	"google.golang.org/api/iterator"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleCatalogClient_ListCatalogs() {
 
 	req := &retailpb.ListCatalogsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ListCatalogsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ListCatalogsRequest.
 	}
 	it := c.ListCatalogs(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleCatalogClient_UpdateCatalog() {
 
 	req := &retailpb.UpdateCatalogRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#UpdateCatalogRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#UpdateCatalogRequest.
 	}
 	resp, err := c.UpdateCatalog(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleCatalogClient_SetDefaultBranch() {
 
 	req := &retailpb.SetDefaultBranchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#SetDefaultBranchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#SetDefaultBranchRequest.
 	}
 	err = c.SetDefaultBranch(ctx, req)
 	if err != nil {
@@ -136,7 +136,7 @@ func ExampleCatalogClient_GetDefaultBranch() {
 
 	req := &retailpb.GetDefaultBranchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#GetDefaultBranchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#GetDefaultBranchRequest.
 	}
 	resp, err := c.GetDefaultBranch(ctx, req)
 	if err != nil {
@@ -161,7 +161,7 @@ func ExampleCatalogClient_GetCompletionConfig() {
 
 	req := &retailpb.GetCompletionConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#GetCompletionConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#GetCompletionConfigRequest.
 	}
 	resp, err := c.GetCompletionConfig(ctx, req)
 	if err != nil {
@@ -186,7 +186,7 @@ func ExampleCatalogClient_UpdateCompletionConfig() {
 
 	req := &retailpb.UpdateCompletionConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#UpdateCompletionConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#UpdateCompletionConfigRequest.
 	}
 	resp, err := c.UpdateCompletionConfig(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExampleCatalogClient_GetAttributesConfig() {
 
 	req := &retailpb.GetAttributesConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#GetAttributesConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#GetAttributesConfigRequest.
 	}
 	resp, err := c.GetAttributesConfig(ctx, req)
 	if err != nil {
@@ -236,7 +236,7 @@ func ExampleCatalogClient_UpdateAttributesConfig() {
 
 	req := &retailpb.UpdateAttributesConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#UpdateAttributesConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#UpdateAttributesConfigRequest.
 	}
 	resp, err := c.UpdateAttributesConfig(ctx, req)
 	if err != nil {
@@ -261,7 +261,7 @@ func ExampleCatalogClient_AddCatalogAttribute() {
 
 	req := &retailpb.AddCatalogAttributeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#AddCatalogAttributeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#AddCatalogAttributeRequest.
 	}
 	resp, err := c.AddCatalogAttribute(ctx, req)
 	if err != nil {
@@ -286,7 +286,7 @@ func ExampleCatalogClient_RemoveCatalogAttribute() {
 
 	req := &retailpb.RemoveCatalogAttributeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#RemoveCatalogAttributeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#RemoveCatalogAttributeRequest.
 	}
 	resp, err := c.RemoveCatalogAttribute(ctx, req)
 	if err != nil {
@@ -311,7 +311,7 @@ func ExampleCatalogClient_ReplaceCatalogAttribute() {
 
 	req := &retailpb.ReplaceCatalogAttributeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ReplaceCatalogAttributeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ReplaceCatalogAttributeRequest.
 	}
 	resp, err := c.ReplaceCatalogAttribute(ctx, req)
 	if err != nil {
diff --git a/retail/apiv2/completion_client.go b/retail/apiv2/completion_client.go
index 3f1a2d256ca..65fd071b164 100644
--- a/retail/apiv2/completion_client.go
+++ b/retail/apiv2/completion_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/retail/apiv2/completion_client_example_test.go b/retail/apiv2/completion_client_example_test.go
index b2b92a6da55..06436b77f14 100644
--- a/retail/apiv2/completion_client_example_test.go
+++ b/retail/apiv2/completion_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	retail "cloud.google.com/go/retail/apiv2"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	"google.golang.org/api/iterator"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleCompletionClient_CompleteQuery() {
 
 	req := &retailpb.CompleteQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#CompleteQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#CompleteQueryRequest.
 	}
 	resp, err := c.CompleteQuery(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleCompletionClient_ImportCompletionData() {
 
 	req := &retailpb.ImportCompletionDataRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ImportCompletionDataRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ImportCompletionDataRequest.
 	}
 	op, err := c.ImportCompletionData(ctx, req)
 	if err != nil {
diff --git a/retail/apiv2/control_client.go b/retail/apiv2/control_client.go
index 03bdb5c8772..45ed913ae5e 100644
--- a/retail/apiv2/control_client.go
+++ b/retail/apiv2/control_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/retail/apiv2/control_client_example_test.go b/retail/apiv2/control_client_example_test.go
index 56fa9bbfc0a..1a63d64a25f 100644
--- a/retail/apiv2/control_client_example_test.go
+++ b/retail/apiv2/control_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	retail "cloud.google.com/go/retail/apiv2"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	"google.golang.org/api/iterator"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleControlClient_CreateControl() {
 
 	req := &retailpb.CreateControlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#CreateControlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#CreateControlRequest.
 	}
 	resp, err := c.CreateControl(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleControlClient_DeleteControl() {
 
 	req := &retailpb.DeleteControlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#DeleteControlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#DeleteControlRequest.
 	}
 	err = c.DeleteControl(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleControlClient_UpdateControl() {
 
 	req := &retailpb.UpdateControlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#UpdateControlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#UpdateControlRequest.
 	}
 	resp, err := c.UpdateControl(ctx, req)
 	if err != nil {
@@ -130,7 +130,7 @@ func ExampleControlClient_GetControl() {
 
 	req := &retailpb.GetControlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#GetControlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#GetControlRequest.
 	}
 	resp, err := c.GetControl(ctx, req)
 	if err != nil {
@@ -155,7 +155,7 @@ func ExampleControlClient_ListControls() {
 
 	req := &retailpb.ListControlsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ListControlsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ListControlsRequest.
 	}
 	it := c.ListControls(ctx, req)
 	for {
diff --git a/retail/apiv2/doc.go b/retail/apiv2/doc.go
index 619d89191a3..0386fb9f546 100644
--- a/retail/apiv2/doc.go
+++ b/retail/apiv2/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &retailpb.ListCatalogsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ListCatalogsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ListCatalogsRequest.
 //	}
 //	it := c.ListCatalogs(ctx, req)
 //	for {
diff --git a/retail/apiv2/prediction_client.go b/retail/apiv2/prediction_client.go
index 18850dc9eb9..e85477f6f76 100644
--- a/retail/apiv2/prediction_client.go
+++ b/retail/apiv2/prediction_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/retail/apiv2/prediction_client_example_test.go b/retail/apiv2/prediction_client_example_test.go
index c1bf1e9c512..c633b05d0df 100644
--- a/retail/apiv2/prediction_client_example_test.go
+++ b/retail/apiv2/prediction_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	retail "cloud.google.com/go/retail/apiv2"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	"google.golang.org/api/iterator"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExamplePredictionClient_Predict() {
 
 	req := &retailpb.PredictRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#PredictRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#PredictRequest.
 	}
 	resp, err := c.Predict(ctx, req)
 	if err != nil {
diff --git a/retail/apiv2/product_client.go b/retail/apiv2/product_client.go
index 67cd64a141e..3481cc09946 100644
--- a/retail/apiv2/product_client.go
+++ b/retail/apiv2/product_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/retail/apiv2/product_client_example_test.go b/retail/apiv2/product_client_example_test.go
index 302ce3e3bbc..9ef04115057 100644
--- a/retail/apiv2/product_client_example_test.go
+++ b/retail/apiv2/product_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	retail "cloud.google.com/go/retail/apiv2"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	"google.golang.org/api/iterator"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleProductClient_CreateProduct() {
 
 	req := &retailpb.CreateProductRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#CreateProductRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#CreateProductRequest.
 	}
 	resp, err := c.CreateProduct(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleProductClient_GetProduct() {
 
 	req := &retailpb.GetProductRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#GetProductRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#GetProductRequest.
 	}
 	resp, err := c.GetProduct(ctx, req)
 	if err != nil {
@@ -107,7 +107,7 @@ func ExampleProductClient_ListProducts() {
 
 	req := &retailpb.ListProductsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ListProductsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ListProductsRequest.
 	}
 	it := c.ListProducts(ctx, req)
 	for {
@@ -138,7 +138,7 @@ func ExampleProductClient_UpdateProduct() {
 
 	req := &retailpb.UpdateProductRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#UpdateProductRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#UpdateProductRequest.
 	}
 	resp, err := c.UpdateProduct(ctx, req)
 	if err != nil {
@@ -163,7 +163,7 @@ func ExampleProductClient_DeleteProduct() {
 
 	req := &retailpb.DeleteProductRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#DeleteProductRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#DeleteProductRequest.
 	}
 	err = c.DeleteProduct(ctx, req)
 	if err != nil {
@@ -186,7 +186,7 @@ func ExampleProductClient_ImportProducts() {
 
 	req := &retailpb.ImportProductsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ImportProductsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ImportProductsRequest.
 	}
 	op, err := c.ImportProducts(ctx, req)
 	if err != nil {
@@ -216,7 +216,7 @@ func ExampleProductClient_SetInventory() {
 
 	req := &retailpb.SetInventoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#SetInventoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#SetInventoryRequest.
 	}
 	op, err := c.SetInventory(ctx, req)
 	if err != nil {
@@ -246,7 +246,7 @@ func ExampleProductClient_AddFulfillmentPlaces() {
 
 	req := &retailpb.AddFulfillmentPlacesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#AddFulfillmentPlacesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#AddFulfillmentPlacesRequest.
 	}
 	op, err := c.AddFulfillmentPlaces(ctx, req)
 	if err != nil {
@@ -276,7 +276,7 @@ func ExampleProductClient_RemoveFulfillmentPlaces() {
 
 	req := &retailpb.RemoveFulfillmentPlacesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#RemoveFulfillmentPlacesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#RemoveFulfillmentPlacesRequest.
 	}
 	op, err := c.RemoveFulfillmentPlaces(ctx, req)
 	if err != nil {
@@ -306,7 +306,7 @@ func ExampleProductClient_AddLocalInventories() {
 
 	req := &retailpb.AddLocalInventoriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#AddLocalInventoriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#AddLocalInventoriesRequest.
 	}
 	op, err := c.AddLocalInventories(ctx, req)
 	if err != nil {
@@ -336,7 +336,7 @@ func ExampleProductClient_RemoveLocalInventories() {
 
 	req := &retailpb.RemoveLocalInventoriesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#RemoveLocalInventoriesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#RemoveLocalInventoriesRequest.
 	}
 	op, err := c.RemoveLocalInventories(ctx, req)
 	if err != nil {
diff --git a/retail/apiv2/retailpb/catalog.pb.go b/retail/apiv2/retailpb/catalog.pb.go
index c9288ebdb8a..4b2725bfc68 100644
--- a/retail/apiv2/retailpb/catalog.pb.go
+++ b/retail/apiv2/retailpb/catalog.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/catalog.proto
 
 package retailpb
diff --git a/retail/apiv2/retailpb/catalog_service.pb.go b/retail/apiv2/retailpb/catalog_service.pb.go
index 3cec318319a..86baf13e0c1 100644
--- a/retail/apiv2/retailpb/catalog_service.pb.go
+++ b/retail/apiv2/retailpb/catalog_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/catalog_service.proto
 
 package retailpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -215,7 +215,7 @@ type UpdateCatalogRequest struct {
 	//
 	// If an unsupported or unknown field is provided, an INVALID_ARGUMENT error
 	// is returned.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCatalogRequest) Reset() {
@@ -257,7 +257,7 @@ func (x *UpdateCatalogRequest) GetCatalog() *Catalog {
 	return nil
 }
 
-func (x *UpdateCatalogRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCatalogRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -415,7 +415,7 @@ type GetDefaultBranchResponse struct {
 	// Full resource name of the branch id currently set as default branch.
 	Branch string `protobuf:"bytes,1,opt,name=branch,proto3" json:"branch,omitempty"`
 	// The time when this branch is set to default.
-	SetTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=set_time,json=setTime,proto3" json:"set_time,omitempty"`
+	SetTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=set_time,json=setTime,proto3" json:"set_time,omitempty"`
 	// This corresponds to
 	// [SetDefaultBranchRequest.note][google.cloud.retail.v2.SetDefaultBranchRequest.note]
 	// field, when this branch was set as default.
@@ -461,7 +461,7 @@ func (x *GetDefaultBranchResponse) GetBranch() string {
 	return ""
 }
 
-func (x *GetDefaultBranchResponse) GetSetTime() *timestamp.Timestamp {
+func (x *GetDefaultBranchResponse) GetSetTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SetTime
 	}
@@ -555,7 +555,7 @@ type UpdateCompletionConfigRequest struct {
 	// * [CompletionConfig.auto_learning][google.cloud.retail.v2.CompletionConfig.auto_learning]
 	//
 	// If not set, all supported fields are updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCompletionConfigRequest) Reset() {
@@ -597,7 +597,7 @@ func (x *UpdateCompletionConfigRequest) GetCompletionConfig() *CompletionConfig
 	return nil
 }
 
-func (x *UpdateCompletionConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCompletionConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -674,7 +674,7 @@ type UpdateAttributesConfigRequest struct {
 	// * [AttributesConfig.catalog_attributes][google.cloud.retail.v2.AttributesConfig.catalog_attributes]
 	//
 	// If not set, all supported fields are updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAttributesConfigRequest) Reset() {
@@ -716,7 +716,7 @@ func (x *UpdateAttributesConfigRequest) GetAttributesConfig() *AttributesConfig
 	return nil
 }
 
-func (x *UpdateAttributesConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAttributesConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -868,7 +868,7 @@ type ReplaceCatalogAttributeRequest struct {
 	// * [CatalogAttribute.key][google.cloud.retail.v2.CatalogAttribute.key]
 	//
 	// If not set, all supported fields are updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *ReplaceCatalogAttributeRequest) Reset() {
@@ -917,7 +917,7 @@ func (x *ReplaceCatalogAttributeRequest) GetCatalogAttribute() *CatalogAttribute
 	return nil
 }
 
-func (x *ReplaceCatalogAttributeRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *ReplaceCatalogAttributeRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1275,12 +1275,12 @@ var file_google_cloud_retail_v2_catalog_service_proto_goTypes = []interface{}{
 	(*RemoveCatalogAttributeRequest)(nil),  // 11: google.cloud.retail.v2.RemoveCatalogAttributeRequest
 	(*ReplaceCatalogAttributeRequest)(nil), // 12: google.cloud.retail.v2.ReplaceCatalogAttributeRequest
 	(*Catalog)(nil),                        // 13: google.cloud.retail.v2.Catalog
-	(*field_mask.FieldMask)(nil),           // 14: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),            // 15: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),          // 14: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),          // 15: google.protobuf.Timestamp
 	(*CompletionConfig)(nil),               // 16: google.cloud.retail.v2.CompletionConfig
 	(*AttributesConfig)(nil),               // 17: google.cloud.retail.v2.AttributesConfig
 	(*CatalogAttribute)(nil),               // 18: google.cloud.retail.v2.CatalogAttribute
-	(*empty.Empty)(nil),                    // 19: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                  // 19: google.protobuf.Empty
 }
 var file_google_cloud_retail_v2_catalog_service_proto_depIdxs = []int32{
 	13, // 0: google.cloud.retail.v2.ListCatalogsResponse.catalogs:type_name -> google.cloud.retail.v2.Catalog
@@ -1557,7 +1557,7 @@ type CatalogServiceClient interface {
 	//     (if branch is not explicitly set).
 	//   - UserEventService will only join events with products from branch
 	//     {newBranch}.
-	SetDefaultBranch(ctx context.Context, in *SetDefaultBranchRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	SetDefaultBranch(ctx context.Context, in *SetDefaultBranchRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Get which branch is currently default branch set by
 	// [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
 	// method under a specified parent catalog.
@@ -1628,8 +1628,8 @@ func (c *catalogServiceClient) UpdateCatalog(ctx context.Context, in *UpdateCata
 	return out, nil
 }
 
-func (c *catalogServiceClient) SetDefaultBranch(ctx context.Context, in *SetDefaultBranchRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *catalogServiceClient) SetDefaultBranch(ctx context.Context, in *SetDefaultBranchRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.retail.v2.CatalogService/SetDefaultBranch", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1749,7 +1749,7 @@ type CatalogServiceServer interface {
 	//     (if branch is not explicitly set).
 	//   - UserEventService will only join events with products from branch
 	//     {newBranch}.
-	SetDefaultBranch(context.Context, *SetDefaultBranchRequest) (*empty.Empty, error)
+	SetDefaultBranch(context.Context, *SetDefaultBranchRequest) (*emptypb.Empty, error)
 	// Get which branch is currently default branch set by
 	// [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
 	// method under a specified parent catalog.
@@ -1804,7 +1804,7 @@ func (*UnimplementedCatalogServiceServer) ListCatalogs(context.Context, *ListCat
 func (*UnimplementedCatalogServiceServer) UpdateCatalog(context.Context, *UpdateCatalogRequest) (*Catalog, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateCatalog not implemented")
 }
-func (*UnimplementedCatalogServiceServer) SetDefaultBranch(context.Context, *SetDefaultBranchRequest) (*empty.Empty, error) {
+func (*UnimplementedCatalogServiceServer) SetDefaultBranch(context.Context, *SetDefaultBranchRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SetDefaultBranch not implemented")
 }
 func (*UnimplementedCatalogServiceServer) GetDefaultBranch(context.Context, *GetDefaultBranchRequest) (*GetDefaultBranchResponse, error) {
diff --git a/retail/apiv2/retailpb/common.pb.go b/retail/apiv2/retailpb/common.pb.go
index dd8e9aa80fe..29b72e6b60c 100644
--- a/retail/apiv2/retailpb/common.pb.go
+++ b/retail/apiv2/retailpb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/common.proto
 
 package retailpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1108,7 +1108,7 @@ type PriceInfo struct {
 	//
 	// Do not set if [price][google.cloud.retail.v2.PriceInfo.price] is always
 	// effective because it will cause additional latency during search.
-	PriceEffectiveTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=price_effective_time,json=priceEffectiveTime,proto3" json:"price_effective_time,omitempty"`
+	PriceEffectiveTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=price_effective_time,json=priceEffectiveTime,proto3" json:"price_effective_time,omitempty"`
 	// The timestamp when the [price][google.cloud.retail.v2.PriceInfo.price]
 	// stops to be effective. The [price][google.cloud.retail.v2.PriceInfo.price]
 	// is used for search before
@@ -1121,7 +1121,7 @@ type PriceInfo struct {
 	//
 	// Do not set if [price][google.cloud.retail.v2.PriceInfo.price] is always
 	// effective because it will cause additional latency during search.
-	PriceExpireTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=price_expire_time,json=priceExpireTime,proto3" json:"price_expire_time,omitempty"`
+	PriceExpireTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=price_expire_time,json=priceExpireTime,proto3" json:"price_expire_time,omitempty"`
 	// Output only. The price range of all the child
 	// [Product.Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT]
 	// [Product][google.cloud.retail.v2.Product]s grouped together on the
@@ -1196,14 +1196,14 @@ func (x *PriceInfo) GetCost() float32 {
 	return 0
 }
 
-func (x *PriceInfo) GetPriceEffectiveTime() *timestamp.Timestamp {
+func (x *PriceInfo) GetPriceEffectiveTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PriceEffectiveTime
 	}
 	return nil
 }
 
-func (x *PriceInfo) GetPriceExpireTime() *timestamp.Timestamp {
+func (x *PriceInfo) GetPriceExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PriceExpireTime
 	}
@@ -1606,9 +1606,9 @@ type Condition_TimeRange struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Start of time range. Range is inclusive.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End of time range. Range is inclusive.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *Condition_TimeRange) Reset() {
@@ -1643,14 +1643,14 @@ func (*Condition_TimeRange) Descriptor() ([]byte, []int) {
 	return file_google_cloud_retail_v2_common_proto_rawDescGZIP(), []int{0, 1}
 }
 
-func (x *Condition_TimeRange) GetStartTime() *timestamp.Timestamp {
+func (x *Condition_TimeRange) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Condition_TimeRange) GetEndTime() *timestamp.Timestamp {
+func (x *Condition_TimeRange) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2592,7 +2592,7 @@ var file_google_cloud_retail_v2_common_proto_goTypes = []interface{}{
 	(*Rule_IgnoreAction)(nil),         // 24: google.cloud.retail.v2.Rule.IgnoreAction
 	(*PriceInfo_PriceRange)(nil),      // 25: google.cloud.retail.v2.PriceInfo.PriceRange
 	nil,                               // 26: google.cloud.retail.v2.LocalInventory.AttributesEntry
-	(*timestamp.Timestamp)(nil),       // 27: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),     // 27: google.protobuf.Timestamp
 }
 var file_google_cloud_retail_v2_common_proto_depIdxs = []int32{
 	15, // 0: google.cloud.retail.v2.Condition.query_terms:type_name -> google.cloud.retail.v2.Condition.QueryTerm
diff --git a/retail/apiv2/retailpb/completion_service.pb.go b/retail/apiv2/retailpb/completion_service.pb.go
index 46ce2e95f12..3b7483fcdbf 100644
--- a/retail/apiv2/retailpb/completion_service.pb.go
+++ b/retail/apiv2/retailpb/completion_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/completion_service.proto
 
 package retailpb
diff --git a/retail/apiv2/retailpb/control.pb.go b/retail/apiv2/retailpb/control.pb.go
index b3baf0ba960..9a1bd4a419c 100644
--- a/retail/apiv2/retailpb/control.pb.go
+++ b/retail/apiv2/retailpb/control.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/control.proto
 
 package retailpb
diff --git a/retail/apiv2/retailpb/control_service.pb.go b/retail/apiv2/retailpb/control_service.pb.go
index 04ae571cf8d..fc11126ea95 100644
--- a/retail/apiv2/retailpb/control_service.pb.go
+++ b/retail/apiv2/retailpb/control_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/control_service.proto
 
 package retailpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -129,7 +129,7 @@ type UpdateControlRequest struct {
 	// * [Control.name][google.cloud.retail.v2.Control.name]
 	//
 	// If not set or empty, all supported fields are updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateControlRequest) Reset() {
@@ -171,7 +171,7 @@ func (x *UpdateControlRequest) GetControl() *Control {
 	return nil
 }
 
-func (x *UpdateControlRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateControlRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -584,15 +584,15 @@ func file_google_cloud_retail_v2_control_service_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_retail_v2_control_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_google_cloud_retail_v2_control_service_proto_goTypes = []interface{}{
-	(*CreateControlRequest)(nil), // 0: google.cloud.retail.v2.CreateControlRequest
-	(*UpdateControlRequest)(nil), // 1: google.cloud.retail.v2.UpdateControlRequest
-	(*DeleteControlRequest)(nil), // 2: google.cloud.retail.v2.DeleteControlRequest
-	(*GetControlRequest)(nil),    // 3: google.cloud.retail.v2.GetControlRequest
-	(*ListControlsRequest)(nil),  // 4: google.cloud.retail.v2.ListControlsRequest
-	(*ListControlsResponse)(nil), // 5: google.cloud.retail.v2.ListControlsResponse
-	(*Control)(nil),              // 6: google.cloud.retail.v2.Control
-	(*field_mask.FieldMask)(nil), // 7: google.protobuf.FieldMask
-	(*empty.Empty)(nil),          // 8: google.protobuf.Empty
+	(*CreateControlRequest)(nil),  // 0: google.cloud.retail.v2.CreateControlRequest
+	(*UpdateControlRequest)(nil),  // 1: google.cloud.retail.v2.UpdateControlRequest
+	(*DeleteControlRequest)(nil),  // 2: google.cloud.retail.v2.DeleteControlRequest
+	(*GetControlRequest)(nil),     // 3: google.cloud.retail.v2.GetControlRequest
+	(*ListControlsRequest)(nil),   // 4: google.cloud.retail.v2.ListControlsRequest
+	(*ListControlsResponse)(nil),  // 5: google.cloud.retail.v2.ListControlsResponse
+	(*Control)(nil),               // 6: google.cloud.retail.v2.Control
+	(*fieldmaskpb.FieldMask)(nil), // 7: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),         // 8: google.protobuf.Empty
 }
 var file_google_cloud_retail_v2_control_service_proto_depIdxs = []int32{
 	6, // 0: google.cloud.retail.v2.CreateControlRequest.control:type_name -> google.cloud.retail.v2.Control
@@ -737,7 +737,7 @@ type ControlServiceClient interface {
 	//
 	// If the [Control][google.cloud.retail.v2.Control] to delete does not exist,
 	// a NOT_FOUND error is returned.
-	DeleteControl(ctx context.Context, in *DeleteControlRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteControl(ctx context.Context, in *DeleteControlRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates a Control.
 	//
 	// [Control][google.cloud.retail.v2.Control] cannot be set to a different
@@ -769,8 +769,8 @@ func (c *controlServiceClient) CreateControl(ctx context.Context, in *CreateCont
 	return out, nil
 }
 
-func (c *controlServiceClient) DeleteControl(ctx context.Context, in *DeleteControlRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *controlServiceClient) DeleteControl(ctx context.Context, in *DeleteControlRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.retail.v2.ControlService/DeleteControl", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -816,7 +816,7 @@ type ControlServiceServer interface {
 	//
 	// If the [Control][google.cloud.retail.v2.Control] to delete does not exist,
 	// a NOT_FOUND error is returned.
-	DeleteControl(context.Context, *DeleteControlRequest) (*empty.Empty, error)
+	DeleteControl(context.Context, *DeleteControlRequest) (*emptypb.Empty, error)
 	// Updates a Control.
 	//
 	// [Control][google.cloud.retail.v2.Control] cannot be set to a different
@@ -838,7 +838,7 @@ type UnimplementedControlServiceServer struct {
 func (*UnimplementedControlServiceServer) CreateControl(context.Context, *CreateControlRequest) (*Control, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateControl not implemented")
 }
-func (*UnimplementedControlServiceServer) DeleteControl(context.Context, *DeleteControlRequest) (*empty.Empty, error) {
+func (*UnimplementedControlServiceServer) DeleteControl(context.Context, *DeleteControlRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteControl not implemented")
 }
 func (*UnimplementedControlServiceServer) UpdateControl(context.Context, *UpdateControlRequest) (*Control, error) {
diff --git a/retail/apiv2/retailpb/import_config.pb.go b/retail/apiv2/retailpb/import_config.pb.go
index 354a79ffab3..9cbef13e237 100644
--- a/retail/apiv2/retailpb/import_config.pb.go
+++ b/retail/apiv2/retailpb/import_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/import_config.proto
 
 package retailpb
@@ -24,13 +24,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -534,7 +534,7 @@ type ImportProductsRequest struct {
 	ErrorsConfig *ImportErrorsConfig `protobuf:"bytes,3,opt,name=errors_config,json=errorsConfig,proto3" json:"errors_config,omitempty"`
 	// Indicates which fields in the provided imported `products` to update. If
 	// not set, all fields are updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// The mode of reconciliation between existing products and the products to be
 	// imported. Defaults to
 	// [ReconciliationMode.INCREMENTAL][google.cloud.retail.v2.ImportProductsRequest.ReconciliationMode.INCREMENTAL].
@@ -614,7 +614,7 @@ func (x *ImportProductsRequest) GetErrorsConfig() *ImportErrorsConfig {
 	return nil
 }
 
-func (x *ImportProductsRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *ImportProductsRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1069,10 +1069,10 @@ type ImportMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Operation create time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Operation last update time. If the operation is done, this is also the
 	// finish time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Count of entries that were processed successfully.
 	SuccessCount int64 `protobuf:"varint,3,opt,name=success_count,json=successCount,proto3" json:"success_count,omitempty"`
 	// Count of entries that encountered errors while processing.
@@ -1121,14 +1121,14 @@ func (*ImportMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_retail_v2_import_config_proto_rawDescGZIP(), []int{11}
 }
 
-func (x *ImportMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *ImportMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *ImportMetadata) GetUpdateTime() *timestamp.Timestamp {
+func (x *ImportMetadata) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1692,8 +1692,8 @@ var file_google_cloud_retail_v2_import_config_proto_goTypes = []interface{}{
 	(*date.Date)(nil),                    // 17: google.type.Date
 	(*Product)(nil),                      // 18: google.cloud.retail.v2.Product
 	(*UserEvent)(nil),                    // 19: google.cloud.retail.v2.UserEvent
-	(*field_mask.FieldMask)(nil),         // 20: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),          // 21: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),        // 20: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),        // 21: google.protobuf.Timestamp
 	(*status.Status)(nil),                // 22: google.rpc.Status
 }
 var file_google_cloud_retail_v2_import_config_proto_depIdxs = []int32{
diff --git a/retail/apiv2/retailpb/prediction_service.pb.go b/retail/apiv2/retailpb/prediction_service.pb.go
index 0e014ee9166..d1bf87ec7ed 100644
--- a/retail/apiv2/retailpb/prediction_service.pb.go
+++ b/retail/apiv2/retailpb/prediction_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/prediction_service.proto
 
 package retailpb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -156,7 +156,7 @@ type PredictRequest struct {
 	//     category.
 	//   - `filterSyntaxV2`: Boolean. False by default. If set to true, the `filter`
 	//     field is interpreteted according to the new, attribute-based syntax.
-	Params map[string]*_struct.Value `protobuf:"bytes,7,rep,name=params,proto3" json:"params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Params map[string]*structpb.Value `protobuf:"bytes,7,rep,name=params,proto3" json:"params,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The labels applied to a resource must meet the following requirements:
 	//
 	//   - Each resource can have multiple labels, up to a maximum of 64.
@@ -252,7 +252,7 @@ func (x *PredictRequest) GetValidateOnly() bool {
 	return false
 }
 
-func (x *PredictRequest) GetParams() map[string]*_struct.Value {
+func (x *PredictRequest) GetParams() map[string]*structpb.Value {
 	if x != nil {
 		return x.Params
 	}
@@ -362,7 +362,7 @@ type PredictResponse_PredictionResult struct {
 	//     `returnProduct` is set to true in `PredictRequest.params`.
 	//   - `score`: Prediction score in double value. Is set if
 	//     `returnScore` is set to true in `PredictRequest.params`.
-	Metadata map[string]*_struct.Value `protobuf:"bytes,2,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Metadata map[string]*structpb.Value `protobuf:"bytes,2,rep,name=metadata,proto3" json:"metadata,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *PredictResponse_PredictionResult) Reset() {
@@ -404,7 +404,7 @@ func (x *PredictResponse_PredictionResult) GetId() string {
 	return ""
 }
 
-func (x *PredictResponse_PredictionResult) GetMetadata() map[string]*_struct.Value {
+func (x *PredictResponse_PredictionResult) GetMetadata() map[string]*structpb.Value {
 	if x != nil {
 		return x.Metadata
 	}
@@ -549,7 +549,7 @@ var file_google_cloud_retail_v2_prediction_service_proto_goTypes = []interface{}
 	(*PredictResponse_PredictionResult)(nil), // 4: google.cloud.retail.v2.PredictResponse.PredictionResult
 	nil,                                      // 5: google.cloud.retail.v2.PredictResponse.PredictionResult.MetadataEntry
 	(*UserEvent)(nil),                        // 6: google.cloud.retail.v2.UserEvent
-	(*_struct.Value)(nil),                    // 7: google.protobuf.Value
+	(*structpb.Value)(nil),                   // 7: google.protobuf.Value
 }
 var file_google_cloud_retail_v2_prediction_service_proto_depIdxs = []int32{
 	6, // 0: google.cloud.retail.v2.PredictRequest.user_event:type_name -> google.cloud.retail.v2.UserEvent
diff --git a/retail/apiv2/retailpb/product.pb.go b/retail/apiv2/retailpb/product.pb.go
index cb214f1ebcf..7d03b1f0b68 100644
--- a/retail/apiv2/retailpb/product.pb.go
+++ b/retail/apiv2/retailpb/product.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/product.proto
 
 package retailpb
@@ -24,13 +24,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -390,7 +390,7 @@ type Product struct {
 	// The timestamp when this [Product][google.cloud.retail.v2.Product] becomes
 	// available for
 	// [SearchService.Search][google.cloud.retail.v2.SearchService.Search].
-	AvailableTime *timestamp.Timestamp `protobuf:"bytes,18,opt,name=available_time,json=availableTime,proto3" json:"available_time,omitempty"`
+	AvailableTime *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=available_time,json=availableTime,proto3" json:"available_time,omitempty"`
 	// The online availability of the [Product][google.cloud.retail.v2.Product].
 	// Default to
 	// [Availability.IN_STOCK][google.cloud.retail.v2.Product.Availability.IN_STOCK].
@@ -400,7 +400,7 @@ type Product struct {
 	// Schema.org property [Offer.availability](https://schema.org/availability).
 	Availability Product_Availability `protobuf:"varint,19,opt,name=availability,proto3,enum=google.cloud.retail.v2.Product_Availability" json:"availability,omitempty"`
 	// The available quantity of the item.
-	AvailableQuantity *wrappers.Int32Value `protobuf:"bytes,20,opt,name=available_quantity,json=availableQuantity,proto3" json:"available_quantity,omitempty"`
+	AvailableQuantity *wrapperspb.Int32Value `protobuf:"bytes,20,opt,name=available_quantity,json=availableQuantity,proto3" json:"available_quantity,omitempty"`
 	// Fulfillment information, such as the store IDs for in-store pickup or
 	// region IDs for different shipping methods.
 	//
@@ -503,7 +503,7 @@ type Product struct {
 	// [available_time][google.cloud.retail.v2.Product.available_time], given it
 	// purely describes product freshness regardless of when it is available on
 	// search and recommendation.
-	PublishTime *timestamp.Timestamp `protobuf:"bytes,33,opt,name=publish_time,json=publishTime,proto3" json:"publish_time,omitempty"`
+	PublishTime *timestamppb.Timestamp `protobuf:"bytes,33,opt,name=publish_time,json=publishTime,proto3" json:"publish_time,omitempty"`
 	// Indicates which fields in the [Product][google.cloud.retail.v2.Product]s
 	// are returned in [SearchResponse][google.cloud.retail.v2.SearchResponse].
 	//
@@ -561,7 +561,7 @@ type Product struct {
 	// Note: Returning more fields in
 	// [SearchResponse][google.cloud.retail.v2.SearchResponse] can increase
 	// response payload size and serving latency.
-	RetrievableFields *field_mask.FieldMask `protobuf:"bytes,30,opt,name=retrievable_fields,json=retrievableFields,proto3" json:"retrievable_fields,omitempty"`
+	RetrievableFields *fieldmaskpb.FieldMask `protobuf:"bytes,30,opt,name=retrievable_fields,json=retrievableFields,proto3" json:"retrievable_fields,omitempty"`
 	// Output only. Product variants grouped together on primary product which
 	// share similar product attributes. It's automatically grouped by
 	// [primary_product_id][google.cloud.retail.v2.Product.primary_product_id] for
@@ -619,14 +619,14 @@ func (m *Product) GetExpiration() isProduct_Expiration {
 	return nil
 }
 
-func (x *Product) GetExpireTime() *timestamp.Timestamp {
+func (x *Product) GetExpireTime() *timestamppb.Timestamp {
 	if x, ok := x.GetExpiration().(*Product_ExpireTime); ok {
 		return x.ExpireTime
 	}
 	return nil
 }
 
-func (x *Product) GetTtl() *duration.Duration {
+func (x *Product) GetTtl() *durationpb.Duration {
 	if x, ok := x.GetExpiration().(*Product_Ttl); ok {
 		return x.Ttl
 	}
@@ -738,7 +738,7 @@ func (x *Product) GetRating() *Rating {
 	return nil
 }
 
-func (x *Product) GetAvailableTime() *timestamp.Timestamp {
+func (x *Product) GetAvailableTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.AvailableTime
 	}
@@ -752,7 +752,7 @@ func (x *Product) GetAvailability() Product_Availability {
 	return Product_AVAILABILITY_UNSPECIFIED
 }
 
-func (x *Product) GetAvailableQuantity() *wrappers.Int32Value {
+func (x *Product) GetAvailableQuantity() *wrapperspb.Int32Value {
 	if x != nil {
 		return x.AvailableQuantity
 	}
@@ -829,14 +829,14 @@ func (x *Product) GetPromotions() []*Promotion {
 	return nil
 }
 
-func (x *Product) GetPublishTime() *timestamp.Timestamp {
+func (x *Product) GetPublishTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PublishTime
 	}
 	return nil
 }
 
-func (x *Product) GetRetrievableFields() *field_mask.FieldMask {
+func (x *Product) GetRetrievableFields() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.RetrievableFields
 	}
@@ -881,7 +881,7 @@ type Product_ExpireTime struct {
 	//
 	// Corresponding properties: Google Merchant Center property
 	// [expiration_date](https://support.google.com/merchants/answer/6324499).
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,16,opt,name=expire_time,json=expireTime,proto3,oneof"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=expire_time,json=expireTime,proto3,oneof"`
 }
 
 type Product_Ttl struct {
@@ -901,7 +901,7 @@ type Product_Ttl struct {
 	// [ProductService.GetProduct][google.cloud.retail.v2.ProductService.GetProduct]
 	// and
 	// [ProductService.ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
-	Ttl *duration.Duration `protobuf:"bytes,17,opt,name=ttl,proto3,oneof"`
+	Ttl *durationpb.Duration `protobuf:"bytes,17,opt,name=ttl,proto3,oneof"`
 }
 
 func (*Product_ExpireTime) isProduct_Expiration() {}
@@ -1103,23 +1103,23 @@ func file_google_cloud_retail_v2_product_proto_rawDescGZIP() []byte {
 var file_google_cloud_retail_v2_product_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
 var file_google_cloud_retail_v2_product_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_cloud_retail_v2_product_proto_goTypes = []interface{}{
-	(Product_Type)(0),            // 0: google.cloud.retail.v2.Product.Type
-	(Product_Availability)(0),    // 1: google.cloud.retail.v2.Product.Availability
-	(*Product)(nil),              // 2: google.cloud.retail.v2.Product
-	nil,                          // 3: google.cloud.retail.v2.Product.AttributesEntry
-	(*timestamp.Timestamp)(nil),  // 4: google.protobuf.Timestamp
-	(*duration.Duration)(nil),    // 5: google.protobuf.Duration
-	(*PriceInfo)(nil),            // 6: google.cloud.retail.v2.PriceInfo
-	(*Rating)(nil),               // 7: google.cloud.retail.v2.Rating
-	(*wrappers.Int32Value)(nil),  // 8: google.protobuf.Int32Value
-	(*FulfillmentInfo)(nil),      // 9: google.cloud.retail.v2.FulfillmentInfo
-	(*Image)(nil),                // 10: google.cloud.retail.v2.Image
-	(*Audience)(nil),             // 11: google.cloud.retail.v2.Audience
-	(*ColorInfo)(nil),            // 12: google.cloud.retail.v2.ColorInfo
-	(*Promotion)(nil),            // 13: google.cloud.retail.v2.Promotion
-	(*field_mask.FieldMask)(nil), // 14: google.protobuf.FieldMask
-	(*LocalInventory)(nil),       // 15: google.cloud.retail.v2.LocalInventory
-	(*CustomAttribute)(nil),      // 16: google.cloud.retail.v2.CustomAttribute
+	(Product_Type)(0),             // 0: google.cloud.retail.v2.Product.Type
+	(Product_Availability)(0),     // 1: google.cloud.retail.v2.Product.Availability
+	(*Product)(nil),               // 2: google.cloud.retail.v2.Product
+	nil,                           // 3: google.cloud.retail.v2.Product.AttributesEntry
+	(*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),   // 5: google.protobuf.Duration
+	(*PriceInfo)(nil),             // 6: google.cloud.retail.v2.PriceInfo
+	(*Rating)(nil),                // 7: google.cloud.retail.v2.Rating
+	(*wrapperspb.Int32Value)(nil), // 8: google.protobuf.Int32Value
+	(*FulfillmentInfo)(nil),       // 9: google.cloud.retail.v2.FulfillmentInfo
+	(*Image)(nil),                 // 10: google.cloud.retail.v2.Image
+	(*Audience)(nil),              // 11: google.cloud.retail.v2.Audience
+	(*ColorInfo)(nil),             // 12: google.cloud.retail.v2.ColorInfo
+	(*Promotion)(nil),             // 13: google.cloud.retail.v2.Promotion
+	(*fieldmaskpb.FieldMask)(nil), // 14: google.protobuf.FieldMask
+	(*LocalInventory)(nil),        // 15: google.cloud.retail.v2.LocalInventory
+	(*CustomAttribute)(nil),       // 16: google.cloud.retail.v2.CustomAttribute
 }
 var file_google_cloud_retail_v2_product_proto_depIdxs = []int32{
 	4,  // 0: google.cloud.retail.v2.Product.expire_time:type_name -> google.protobuf.Timestamp
diff --git a/retail/apiv2/retailpb/product_service.pb.go b/retail/apiv2/retailpb/product_service.pb.go
index b352cfedeb0..ed219b7cda9 100644
--- a/retail/apiv2/retailpb/product_service.pb.go
+++ b/retail/apiv2/retailpb/product_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/product_service.proto
 
 package retailpb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -219,7 +219,7 @@ type UpdateProductRequest struct {
 	// "attributes.${key_name}". If a key name is present in the mask but not in
 	// the patching product from the request, this key will be deleted after the
 	// update.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// If set to true, and the [Product][google.cloud.retail.v2.Product] is not
 	// found, a new [Product][google.cloud.retail.v2.Product] will be created. In
 	// this situation, `update_mask` is ignored.
@@ -265,7 +265,7 @@ func (x *UpdateProductRequest) GetProduct() *Product {
 	return nil
 }
 
-func (x *UpdateProductRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateProductRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -435,7 +435,7 @@ type ListProductsRequest struct {
 	//
 	// If an unsupported or unknown field is provided, an INVALID_ARGUMENT error
 	// is returned.
-	ReadMask *field_mask.FieldMask `protobuf:"bytes,5,opt,name=read_mask,json=readMask,proto3" json:"read_mask,omitempty"`
+	ReadMask *fieldmaskpb.FieldMask `protobuf:"bytes,5,opt,name=read_mask,json=readMask,proto3" json:"read_mask,omitempty"`
 }
 
 func (x *ListProductsRequest) Reset() {
@@ -498,7 +498,7 @@ func (x *ListProductsRequest) GetFilter() string {
 	return ""
 }
 
-func (x *ListProductsRequest) GetReadMask() *field_mask.FieldMask {
+func (x *ListProductsRequest) GetReadMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.ReadMask
 	}
@@ -642,11 +642,11 @@ type SetInventoryRequest struct {
 	//
 	// If an unsupported or unknown field is provided, an INVALID_ARGUMENT error
 	// is returned and the entire update will be ignored.
-	SetMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=set_mask,json=setMask,proto3" json:"set_mask,omitempty"`
+	SetMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=set_mask,json=setMask,proto3" json:"set_mask,omitempty"`
 	// The time when the request is issued, used to prevent
 	// out-of-order updates on inventory fields with the last update time
 	// recorded. If not provided, the internal system time will be used.
-	SetTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=set_time,json=setTime,proto3" json:"set_time,omitempty"`
+	SetTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=set_time,json=setTime,proto3" json:"set_time,omitempty"`
 	// If set to true, and the [Product][google.cloud.retail.v2.Product] with name
 	// [Product.name][google.cloud.retail.v2.Product.name] is not found, the
 	// inventory update will still be processed and retained for at most 1 day
@@ -695,14 +695,14 @@ func (x *SetInventoryRequest) GetInventory() *Product {
 	return nil
 }
 
-func (x *SetInventoryRequest) GetSetMask() *field_mask.FieldMask {
+func (x *SetInventoryRequest) GetSetMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.SetMask
 	}
 	return nil
 }
 
-func (x *SetInventoryRequest) GetSetTime() *timestamp.Timestamp {
+func (x *SetInventoryRequest) GetSetTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SetTime
 	}
@@ -856,7 +856,7 @@ type AddFulfillmentPlacesRequest struct {
 	// The time when the fulfillment updates are issued, used to prevent
 	// out-of-order updates on fulfillment information. If not provided, the
 	// internal system time will be used.
-	AddTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=add_time,json=addTime,proto3" json:"add_time,omitempty"`
+	AddTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=add_time,json=addTime,proto3" json:"add_time,omitempty"`
 	// If set to true, and the [Product][google.cloud.retail.v2.Product] is not
 	// found, the fulfillment information will still be processed and retained for
 	// at most 1 day and processed once the
@@ -919,7 +919,7 @@ func (x *AddFulfillmentPlacesRequest) GetPlaceIds() []string {
 	return nil
 }
 
-func (x *AddFulfillmentPlacesRequest) GetAddTime() *timestamp.Timestamp {
+func (x *AddFulfillmentPlacesRequest) GetAddTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.AddTime
 	}
@@ -1052,11 +1052,11 @@ type AddLocalInventoriesRequest struct {
 	//
 	// If an unsupported or unknown field is provided, an INVALID_ARGUMENT error
 	// is returned and the entire update will be ignored.
-	AddMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=add_mask,json=addMask,proto3" json:"add_mask,omitempty"`
+	AddMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=add_mask,json=addMask,proto3" json:"add_mask,omitempty"`
 	// The time when the inventory updates are issued. Used to prevent
 	// out-of-order updates on local inventory fields. If not provided, the
 	// internal system time will be used.
-	AddTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=add_time,json=addTime,proto3" json:"add_time,omitempty"`
+	AddTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=add_time,json=addTime,proto3" json:"add_time,omitempty"`
 	// If set to true, and the [Product][google.cloud.retail.v2.Product] is not
 	// found, the local inventory will still be processed and retained for at most
 	// 1 day and processed once the [Product][google.cloud.retail.v2.Product] is
@@ -1111,14 +1111,14 @@ func (x *AddLocalInventoriesRequest) GetLocalInventories() []*LocalInventory {
 	return nil
 }
 
-func (x *AddLocalInventoriesRequest) GetAddMask() *field_mask.FieldMask {
+func (x *AddLocalInventoriesRequest) GetAddMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.AddMask
 	}
 	return nil
 }
 
-func (x *AddLocalInventoriesRequest) GetAddTime() *timestamp.Timestamp {
+func (x *AddLocalInventoriesRequest) GetAddTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.AddTime
 	}
@@ -1240,7 +1240,7 @@ type RemoveLocalInventoriesRequest struct {
 	// The time when the inventory deletions are issued. Used to prevent
 	// out-of-order updates and deletions on local inventory fields. If not
 	// provided, the internal system time will be used.
-	RemoveTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=remove_time,json=removeTime,proto3" json:"remove_time,omitempty"`
+	RemoveTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=remove_time,json=removeTime,proto3" json:"remove_time,omitempty"`
 	// If set to true, and the [Product][google.cloud.retail.v2.Product] is not
 	// found, the local inventory removal request will still be processed and
 	// retained for at most 1 day and processed once the
@@ -1296,7 +1296,7 @@ func (x *RemoveLocalInventoriesRequest) GetPlaceIds() []string {
 	return nil
 }
 
-func (x *RemoveLocalInventoriesRequest) GetRemoveTime() *timestamp.Timestamp {
+func (x *RemoveLocalInventoriesRequest) GetRemoveTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RemoveTime
 	}
@@ -1447,7 +1447,7 @@ type RemoveFulfillmentPlacesRequest struct {
 	// The time when the fulfillment updates are issued, used to prevent
 	// out-of-order updates on fulfillment information. If not provided, the
 	// internal system time will be used.
-	RemoveTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=remove_time,json=removeTime,proto3" json:"remove_time,omitempty"`
+	RemoveTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=remove_time,json=removeTime,proto3" json:"remove_time,omitempty"`
 	// If set to true, and the [Product][google.cloud.retail.v2.Product] is not
 	// found, the fulfillment information will still be processed and retained for
 	// at most 1 day and processed once the
@@ -1510,7 +1510,7 @@ func (x *RemoveFulfillmentPlacesRequest) GetPlaceIds() []string {
 	return nil
 }
 
-func (x *RemoveFulfillmentPlacesRequest) GetRemoveTime() *timestamp.Timestamp {
+func (x *RemoveFulfillmentPlacesRequest) GetRemoveTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RemoveTime
 	}
@@ -2034,11 +2034,11 @@ var file_google_cloud_retail_v2_product_service_proto_goTypes = []interface{}{
 	(*RemoveFulfillmentPlacesMetadata)(nil), // 19: google.cloud.retail.v2.RemoveFulfillmentPlacesMetadata
 	(*RemoveFulfillmentPlacesResponse)(nil), // 20: google.cloud.retail.v2.RemoveFulfillmentPlacesResponse
 	(*Product)(nil),                         // 21: google.cloud.retail.v2.Product
-	(*field_mask.FieldMask)(nil),            // 22: google.protobuf.FieldMask
-	(*timestamp.Timestamp)(nil),             // 23: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),           // 22: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil),           // 23: google.protobuf.Timestamp
 	(*LocalInventory)(nil),                  // 24: google.cloud.retail.v2.LocalInventory
 	(*ImportProductsRequest)(nil),           // 25: google.cloud.retail.v2.ImportProductsRequest
-	(*empty.Empty)(nil),                     // 26: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                   // 26: google.protobuf.Empty
 	(*longrunning.Operation)(nil),           // 27: google.longrunning.Operation
 }
 var file_google_cloud_retail_v2_product_service_proto_depIdxs = []int32{
@@ -2388,7 +2388,7 @@ type ProductServiceClient interface {
 	// Updates a [Product][google.cloud.retail.v2.Product].
 	UpdateProduct(ctx context.Context, in *UpdateProductRequest, opts ...grpc.CallOption) (*Product, error)
 	// Deletes a [Product][google.cloud.retail.v2.Product].
-	DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Bulk import of multiple [Product][google.cloud.retail.v2.Product]s.
 	//
 	// Request processing may be synchronous.
@@ -2598,8 +2598,8 @@ func (c *productServiceClient) UpdateProduct(ctx context.Context, in *UpdateProd
 	return out, nil
 }
 
-func (c *productServiceClient) DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *productServiceClient) DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.retail.v2.ProductService/DeleteProduct", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2672,7 +2672,7 @@ type ProductServiceServer interface {
 	// Updates a [Product][google.cloud.retail.v2.Product].
 	UpdateProduct(context.Context, *UpdateProductRequest) (*Product, error)
 	// Deletes a [Product][google.cloud.retail.v2.Product].
-	DeleteProduct(context.Context, *DeleteProductRequest) (*empty.Empty, error)
+	DeleteProduct(context.Context, *DeleteProductRequest) (*emptypb.Empty, error)
 	// Bulk import of multiple [Product][google.cloud.retail.v2.Product]s.
 	//
 	// Request processing may be synchronous.
@@ -2854,7 +2854,7 @@ func (*UnimplementedProductServiceServer) ListProducts(context.Context, *ListPro
 func (*UnimplementedProductServiceServer) UpdateProduct(context.Context, *UpdateProductRequest) (*Product, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateProduct not implemented")
 }
-func (*UnimplementedProductServiceServer) DeleteProduct(context.Context, *DeleteProductRequest) (*empty.Empty, error) {
+func (*UnimplementedProductServiceServer) DeleteProduct(context.Context, *DeleteProductRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteProduct not implemented")
 }
 func (*UnimplementedProductServiceServer) ImportProducts(context.Context, *ImportProductsRequest) (*longrunning.Operation, error) {
diff --git a/retail/apiv2/retailpb/promotion.pb.go b/retail/apiv2/retailpb/promotion.pb.go
index 9fb80cc0bd7..897708e38ad 100644
--- a/retail/apiv2/retailpb/promotion.pb.go
+++ b/retail/apiv2/retailpb/promotion.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/promotion.proto
 
 package retailpb
diff --git a/retail/apiv2/retailpb/purge_config.pb.go b/retail/apiv2/retailpb/purge_config.pb.go
index 6535497c9a8..75bad2761f2 100644
--- a/retail/apiv2/retailpb/purge_config.pb.go
+++ b/retail/apiv2/retailpb/purge_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/purge_config.proto
 
 package retailpb
diff --git a/retail/apiv2/retailpb/search_service.pb.go b/retail/apiv2/retailpb/search_service.pb.go
index 9ae12b75a1a..be7a1fac991 100644
--- a/retail/apiv2/retailpb/search_service.pb.go
+++ b/retail/apiv2/retailpb/search_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/search_service.proto
 
 package retailpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -1706,7 +1706,7 @@ type SearchResponse_SearchResult struct {
 	// For example, a key "sku1" with field mask
 	// "products.color_info" indicates there is a match between
 	// "sku1" [ColorInfo][google.cloud.retail.v2.ColorInfo] and the query.
-	MatchingVariantFields map[string]*field_mask.FieldMask `protobuf:"bytes,4,rep,name=matching_variant_fields,json=matchingVariantFields,proto3" json:"matching_variant_fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	MatchingVariantFields map[string]*fieldmaskpb.FieldMask `protobuf:"bytes,4,rep,name=matching_variant_fields,json=matchingVariantFields,proto3" json:"matching_variant_fields,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// The rollup matching
 	// [variant][google.cloud.retail.v2.Product.Type.VARIANT]
 	// [Product][google.cloud.retail.v2.Product] attributes. The key is one of
@@ -1738,7 +1738,7 @@ type SearchResponse_SearchResult struct {
 	// [google.protobuf.Value][google.protobuf.Value]. For example,
 	// `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
 	// are 10 variants in this product are available in the store "store1".
-	VariantRollupValues map[string]*_struct.Value `protobuf:"bytes,5,rep,name=variant_rollup_values,json=variantRollupValues,proto3" json:"variant_rollup_values,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	VariantRollupValues map[string]*structpb.Value `protobuf:"bytes,5,rep,name=variant_rollup_values,json=variantRollupValues,proto3" json:"variant_rollup_values,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Specifies previous events related to this product for this user based on
 	// [UserEvent][google.cloud.retail.v2.UserEvent] with same
 	// [SearchRequest.visitor_id][google.cloud.retail.v2.SearchRequest.visitor_id]
@@ -1808,14 +1808,14 @@ func (x *SearchResponse_SearchResult) GetMatchingVariantCount() int32 {
 	return 0
 }
 
-func (x *SearchResponse_SearchResult) GetMatchingVariantFields() map[string]*field_mask.FieldMask {
+func (x *SearchResponse_SearchResult) GetMatchingVariantFields() map[string]*fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.MatchingVariantFields
 	}
 	return nil
 }
 
-func (x *SearchResponse_SearchResult) GetVariantRollupValues() map[string]*_struct.Value {
+func (x *SearchResponse_SearchResult) GetVariantRollupValues() map[string]*structpb.Value {
 	if x != nil {
 		return x.VariantRollupValues
 	}
@@ -2480,8 +2480,8 @@ var file_google_cloud_retail_v2_search_service_proto_goTypes = []interface{}{
 	(*UserInfo)(nil),                        // 22: google.cloud.retail.v2.UserInfo
 	(*Interval)(nil),                        // 23: google.cloud.retail.v2.Interval
 	(*Product)(nil),                         // 24: google.cloud.retail.v2.Product
-	(*field_mask.FieldMask)(nil),            // 25: google.protobuf.FieldMask
-	(*_struct.Value)(nil),                   // 26: google.protobuf.Value
+	(*fieldmaskpb.FieldMask)(nil),           // 25: google.protobuf.FieldMask
+	(*structpb.Value)(nil),                  // 26: google.protobuf.Value
 }
 var file_google_cloud_retail_v2_search_service_proto_depIdxs = []int32{
 	22, // 0: google.cloud.retail.v2.SearchRequest.user_info:type_name -> google.cloud.retail.v2.UserInfo
diff --git a/retail/apiv2/retailpb/serving_config.pb.go b/retail/apiv2/retailpb/serving_config.pb.go
index f9c49db9fc0..3ff1bbb4722 100644
--- a/retail/apiv2/retailpb/serving_config.pb.go
+++ b/retail/apiv2/retailpb/serving_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/serving_config.proto
 
 package retailpb
diff --git a/retail/apiv2/retailpb/serving_config_service.pb.go b/retail/apiv2/retailpb/serving_config_service.pb.go
index f9553da1e4e..ee3c61ed77b 100644
--- a/retail/apiv2/retailpb/serving_config_service.pb.go
+++ b/retail/apiv2/retailpb/serving_config_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/serving_config_service.proto
 
 package retailpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -129,7 +129,7 @@ type UpdateServingConfigRequest struct {
 	// * [ServingConfig.name][google.cloud.retail.v2.ServingConfig.name]
 	//
 	// If not set, all supported fields are updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateServingConfigRequest) Reset() {
@@ -171,7 +171,7 @@ func (x *UpdateServingConfigRequest) GetServingConfig() *ServingConfig {
 	return nil
 }
 
-func (x *UpdateServingConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateServingConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -761,8 +761,8 @@ var file_google_cloud_retail_v2_serving_config_service_proto_goTypes = []interfa
 	(*AddControlRequest)(nil),          // 6: google.cloud.retail.v2.AddControlRequest
 	(*RemoveControlRequest)(nil),       // 7: google.cloud.retail.v2.RemoveControlRequest
 	(*ServingConfig)(nil),              // 8: google.cloud.retail.v2.ServingConfig
-	(*field_mask.FieldMask)(nil),       // 9: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                // 10: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),      // 9: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),              // 10: google.protobuf.Empty
 }
 var file_google_cloud_retail_v2_serving_config_service_proto_depIdxs = []int32{
 	8,  // 0: google.cloud.retail.v2.CreateServingConfigRequest.serving_config:type_name -> google.cloud.retail.v2.ServingConfig
@@ -935,7 +935,7 @@ type ServingConfigServiceClient interface {
 	// Deletes a ServingConfig.
 	//
 	// Returns a NotFound error if the ServingConfig does not exist.
-	DeleteServingConfig(ctx context.Context, in *DeleteServingConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteServingConfig(ctx context.Context, in *DeleteServingConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates a ServingConfig.
 	UpdateServingConfig(ctx context.Context, in *UpdateServingConfigRequest, opts ...grpc.CallOption) (*ServingConfig, error)
 	// Gets a ServingConfig.
@@ -976,8 +976,8 @@ func (c *servingConfigServiceClient) CreateServingConfig(ctx context.Context, in
 	return out, nil
 }
 
-func (c *servingConfigServiceClient) DeleteServingConfig(ctx context.Context, in *DeleteServingConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *servingConfigServiceClient) DeleteServingConfig(ctx context.Context, in *DeleteServingConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.retail.v2.ServingConfigService/DeleteServingConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1041,7 +1041,7 @@ type ServingConfigServiceServer interface {
 	// Deletes a ServingConfig.
 	//
 	// Returns a NotFound error if the ServingConfig does not exist.
-	DeleteServingConfig(context.Context, *DeleteServingConfigRequest) (*empty.Empty, error)
+	DeleteServingConfig(context.Context, *DeleteServingConfigRequest) (*emptypb.Empty, error)
 	// Updates a ServingConfig.
 	UpdateServingConfig(context.Context, *UpdateServingConfigRequest) (*ServingConfig, error)
 	// Gets a ServingConfig.
@@ -1072,7 +1072,7 @@ type UnimplementedServingConfigServiceServer struct {
 func (*UnimplementedServingConfigServiceServer) CreateServingConfig(context.Context, *CreateServingConfigRequest) (*ServingConfig, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateServingConfig not implemented")
 }
-func (*UnimplementedServingConfigServiceServer) DeleteServingConfig(context.Context, *DeleteServingConfigRequest) (*empty.Empty, error) {
+func (*UnimplementedServingConfigServiceServer) DeleteServingConfig(context.Context, *DeleteServingConfigRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteServingConfig not implemented")
 }
 func (*UnimplementedServingConfigServiceServer) UpdateServingConfig(context.Context, *UpdateServingConfigRequest) (*ServingConfig, error) {
diff --git a/retail/apiv2/retailpb/user_event.pb.go b/retail/apiv2/retailpb/user_event.pb.go
index a938612e159..511b834e3bb 100644
--- a/retail/apiv2/retailpb/user_event.pb.go
+++ b/retail/apiv2/retailpb/user_event.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/user_event.proto
 
 package retailpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -88,7 +88,7 @@ type UserEvent struct {
 	// Only required for
 	// [UserEventService.ImportUserEvents][google.cloud.retail.v2.UserEventService.ImportUserEvents]
 	// method. Timestamp of when the user event happened.
-	EventTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
+	EventTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
 	// A list of identifiers for the independent experiment groups this user event
 	// belongs to. This is used to distinguish between user events associated with
 	// different experiment setups (e.g. using Retail API, using different
@@ -314,7 +314,7 @@ func (x *UserEvent) GetSessionId() string {
 	return ""
 }
 
-func (x *UserEvent) GetEventTime() *timestamp.Timestamp {
+func (x *UserEvent) GetEventTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EventTime
 	}
@@ -462,7 +462,7 @@ type ProductDetail struct {
 	// For example, this field will be 2 if two products are added to the shopping
 	// cart for `purchase-complete` event. Required for `add-to-cart` and
 	// `purchase-complete` event types.
-	Quantity *wrappers.Int32Value `protobuf:"bytes,2,opt,name=quantity,proto3" json:"quantity,omitempty"`
+	Quantity *wrapperspb.Int32Value `protobuf:"bytes,2,opt,name=quantity,proto3" json:"quantity,omitempty"`
 }
 
 func (x *ProductDetail) Reset() {
@@ -504,7 +504,7 @@ func (x *ProductDetail) GetProduct() *Product {
 	return nil
 }
 
-func (x *ProductDetail) GetQuantity() *wrappers.Int32Value {
+func (x *ProductDetail) GetQuantity() *wrapperspb.Int32Value {
 	if x != nil {
 		return x.Quantity
 	}
@@ -818,16 +818,16 @@ func file_google_cloud_retail_v2_user_event_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_retail_v2_user_event_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_google_cloud_retail_v2_user_event_proto_goTypes = []interface{}{
-	(*UserEvent)(nil),           // 0: google.cloud.retail.v2.UserEvent
-	(*ProductDetail)(nil),       // 1: google.cloud.retail.v2.ProductDetail
-	(*CompletionDetail)(nil),    // 2: google.cloud.retail.v2.CompletionDetail
-	(*PurchaseTransaction)(nil), // 3: google.cloud.retail.v2.PurchaseTransaction
-	nil,                         // 4: google.cloud.retail.v2.UserEvent.AttributesEntry
-	(*timestamp.Timestamp)(nil), // 5: google.protobuf.Timestamp
-	(*UserInfo)(nil),            // 6: google.cloud.retail.v2.UserInfo
-	(*Product)(nil),             // 7: google.cloud.retail.v2.Product
-	(*wrappers.Int32Value)(nil), // 8: google.protobuf.Int32Value
-	(*CustomAttribute)(nil),     // 9: google.cloud.retail.v2.CustomAttribute
+	(*UserEvent)(nil),             // 0: google.cloud.retail.v2.UserEvent
+	(*ProductDetail)(nil),         // 1: google.cloud.retail.v2.ProductDetail
+	(*CompletionDetail)(nil),      // 2: google.cloud.retail.v2.CompletionDetail
+	(*PurchaseTransaction)(nil),   // 3: google.cloud.retail.v2.PurchaseTransaction
+	nil,                           // 4: google.cloud.retail.v2.UserEvent.AttributesEntry
+	(*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp
+	(*UserInfo)(nil),              // 6: google.cloud.retail.v2.UserInfo
+	(*Product)(nil),               // 7: google.cloud.retail.v2.Product
+	(*wrapperspb.Int32Value)(nil), // 8: google.protobuf.Int32Value
+	(*CustomAttribute)(nil),       // 9: google.cloud.retail.v2.CustomAttribute
 }
 var file_google_cloud_retail_v2_user_event_proto_depIdxs = []int32{
 	5, // 0: google.cloud.retail.v2.UserEvent.event_time:type_name -> google.protobuf.Timestamp
diff --git a/retail/apiv2/retailpb/user_event_service.pb.go b/retail/apiv2/retailpb/user_event_service.pb.go
index 76d0606ffa9..933c180921c 100644
--- a/retail/apiv2/retailpb/user_event_service.pb.go
+++ b/retail/apiv2/retailpb/user_event_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/retail/v2/user_event_service.proto
 
 package retailpb
diff --git a/retail/apiv2/search_client.go b/retail/apiv2/search_client.go
index 351a4f393de..79309cfe5a3 100644
--- a/retail/apiv2/search_client.go
+++ b/retail/apiv2/search_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/retail/apiv2/search_client_example_test.go b/retail/apiv2/search_client_example_test.go
index 7aad6356d1f..ff4b1e4ba16 100644
--- a/retail/apiv2/search_client_example_test.go
+++ b/retail/apiv2/search_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	retail "cloud.google.com/go/retail/apiv2"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	"google.golang.org/api/iterator"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleSearchClient_Search() {
 
 	req := &retailpb.SearchRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#SearchRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#SearchRequest.
 	}
 	it := c.Search(ctx, req)
 	for {
diff --git a/retail/apiv2/serving_config_client.go b/retail/apiv2/serving_config_client.go
index 06c6fa1819f..9bf37609d18 100644
--- a/retail/apiv2/serving_config_client.go
+++ b/retail/apiv2/serving_config_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/retail/apiv2/serving_config_client_example_test.go b/retail/apiv2/serving_config_client_example_test.go
index 70f4209ba19..29101dee757 100644
--- a/retail/apiv2/serving_config_client_example_test.go
+++ b/retail/apiv2/serving_config_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	retail "cloud.google.com/go/retail/apiv2"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	"google.golang.org/api/iterator"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleServingConfigClient_CreateServingConfig() {
 
 	req := &retailpb.CreateServingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#CreateServingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#CreateServingConfigRequest.
 	}
 	resp, err := c.CreateServingConfig(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleServingConfigClient_DeleteServingConfig() {
 
 	req := &retailpb.DeleteServingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#DeleteServingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#DeleteServingConfigRequest.
 	}
 	err = c.DeleteServingConfig(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleServingConfigClient_UpdateServingConfig() {
 
 	req := &retailpb.UpdateServingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#UpdateServingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#UpdateServingConfigRequest.
 	}
 	resp, err := c.UpdateServingConfig(ctx, req)
 	if err != nil {
@@ -130,7 +130,7 @@ func ExampleServingConfigClient_GetServingConfig() {
 
 	req := &retailpb.GetServingConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#GetServingConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#GetServingConfigRequest.
 	}
 	resp, err := c.GetServingConfig(ctx, req)
 	if err != nil {
@@ -155,7 +155,7 @@ func ExampleServingConfigClient_ListServingConfigs() {
 
 	req := &retailpb.ListServingConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ListServingConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ListServingConfigsRequest.
 	}
 	it := c.ListServingConfigs(ctx, req)
 	for {
@@ -186,7 +186,7 @@ func ExampleServingConfigClient_AddControl() {
 
 	req := &retailpb.AddControlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#AddControlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#AddControlRequest.
 	}
 	resp, err := c.AddControl(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExampleServingConfigClient_RemoveControl() {
 
 	req := &retailpb.RemoveControlRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#RemoveControlRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#RemoveControlRequest.
 	}
 	resp, err := c.RemoveControl(ctx, req)
 	if err != nil {
diff --git a/retail/apiv2/user_event_client.go b/retail/apiv2/user_event_client.go
index 56bc474e09b..21b05d3d0ce 100644
--- a/retail/apiv2/user_event_client.go
+++ b/retail/apiv2/user_event_client.go
@@ -25,13 +25,13 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	httpbodypb "google.golang.org/genproto/googleapis/api/httpbody"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/retail/apiv2/user_event_client_example_test.go b/retail/apiv2/user_event_client_example_test.go
index 9bc5aa59f08..fe217bfe8ee 100644
--- a/retail/apiv2/user_event_client_example_test.go
+++ b/retail/apiv2/user_event_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	retail "cloud.google.com/go/retail/apiv2"
+	retailpb "cloud.google.com/go/retail/apiv2/retailpb"
 	"google.golang.org/api/iterator"
-	retailpb "google.golang.org/genproto/googleapis/cloud/retail/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleUserEventClient_WriteUserEvent() {
 
 	req := &retailpb.WriteUserEventRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#WriteUserEventRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#WriteUserEventRequest.
 	}
 	resp, err := c.WriteUserEvent(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleUserEventClient_CollectUserEvent() {
 
 	req := &retailpb.CollectUserEventRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#CollectUserEventRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#CollectUserEventRequest.
 	}
 	resp, err := c.CollectUserEvent(ctx, req)
 	if err != nil {
@@ -107,7 +107,7 @@ func ExampleUserEventClient_PurgeUserEvents() {
 
 	req := &retailpb.PurgeUserEventsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#PurgeUserEventsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#PurgeUserEventsRequest.
 	}
 	op, err := c.PurgeUserEvents(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleUserEventClient_ImportUserEvents() {
 
 	req := &retailpb.ImportUserEventsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#ImportUserEventsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#ImportUserEventsRequest.
 	}
 	op, err := c.ImportUserEvents(ctx, req)
 	if err != nil {
@@ -167,7 +167,7 @@ func ExampleUserEventClient_RejoinUserEvents() {
 
 	req := &retailpb.RejoinUserEventsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/retail/v2#RejoinUserEventsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/retail/apiv2/retailpb#RejoinUserEventsRequest.
 	}
 	op, err := c.RejoinUserEvents(ctx, req)
 	if err != nil {
diff --git a/retail/go.mod b/retail/go.mod
index 53ad245b56e..d2e85848c40 100644
--- a/retail/go.mod
+++ b/retail/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/retail
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/retail/go.sum b/retail/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/retail/go.sum
+++ b/retail/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/run/aliasshim/aliasshim.go b/run/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/run/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/run/apiv2/doc.go b/run/apiv2/doc.go
index cfe5ebf2015..41396b76e82 100644
--- a/run/apiv2/doc.go
+++ b/run/apiv2/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &runpb.GetRevisionRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#GetRevisionRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#GetRevisionRequest.
 //	}
 //	resp, err := c.GetRevision(ctx, req)
 //	if err != nil {
diff --git a/run/apiv2/revisions_client.go b/run/apiv2/revisions_client.go
index 602fd75460a..9841ce3c922 100644
--- a/run/apiv2/revisions_client.go
+++ b/run/apiv2/revisions_client.go
@@ -27,12 +27,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	runpb "cloud.google.com/go/run/apiv2/runpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	runpb "google.golang.org/genproto/googleapis/cloud/run/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/run/apiv2/revisions_client_example_test.go b/run/apiv2/revisions_client_example_test.go
index e2033f4b34f..1a88950dd8a 100644
--- a/run/apiv2/revisions_client_example_test.go
+++ b/run/apiv2/revisions_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	run "cloud.google.com/go/run/apiv2"
+	runpb "cloud.google.com/go/run/apiv2/runpb"
 	"google.golang.org/api/iterator"
-	runpb "google.golang.org/genproto/googleapis/cloud/run/v2"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleRevisionsClient_GetRevision() {
 
 	req := &runpb.GetRevisionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#GetRevisionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#GetRevisionRequest.
 	}
 	resp, err := c.GetRevision(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleRevisionsClient_ListRevisions() {
 
 	req := &runpb.ListRevisionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#ListRevisionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#ListRevisionsRequest.
 	}
 	it := c.ListRevisions(ctx, req)
 	for {
@@ -113,7 +113,7 @@ func ExampleRevisionsClient_DeleteRevision() {
 
 	req := &runpb.DeleteRevisionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#DeleteRevisionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#DeleteRevisionRequest.
 	}
 	op, err := c.DeleteRevision(ctx, req)
 	if err != nil {
diff --git a/run/apiv2/runpb/condition.pb.go b/run/apiv2/runpb/condition.pb.go
index 03b79c52e51..f6f4c8c1a47 100644
--- a/run/apiv2/runpb/condition.pb.go
+++ b/run/apiv2/runpb/condition.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/run/v2/condition.proto
 
 package runpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -425,7 +425,7 @@ type Condition struct {
 	// Human readable message indicating details about the current status.
 	Message string `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"`
 	// Last time the condition transitioned from one status to another.
-	LastTransitionTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=last_transition_time,json=lastTransitionTime,proto3" json:"last_transition_time,omitempty"`
+	LastTransitionTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=last_transition_time,json=lastTransitionTime,proto3" json:"last_transition_time,omitempty"`
 	// How to interpret failures of this condition, one of Error, Warning, Info
 	Severity Condition_Severity `protobuf:"varint,5,opt,name=severity,proto3,enum=google.cloud.run.v2.Condition_Severity" json:"severity,omitempty"`
 	// The reason for this condition. Depending on the condition type,
@@ -493,7 +493,7 @@ func (x *Condition) GetMessage() string {
 	return ""
 }
 
-func (x *Condition) GetLastTransitionTime() *timestamp.Timestamp {
+func (x *Condition) GetLastTransitionTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastTransitionTime
 	}
@@ -699,7 +699,7 @@ var file_google_cloud_run_v2_condition_proto_goTypes = []interface{}{
 	(Condition_RevisionReason)(0),  // 3: google.cloud.run.v2.Condition.RevisionReason
 	(Condition_ExecutionReason)(0), // 4: google.cloud.run.v2.Condition.ExecutionReason
 	(*Condition)(nil),              // 5: google.cloud.run.v2.Condition
-	(*timestamp.Timestamp)(nil),    // 6: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),  // 6: google.protobuf.Timestamp
 }
 var file_google_cloud_run_v2_condition_proto_depIdxs = []int32{
 	0, // 0: google.cloud.run.v2.Condition.state:type_name -> google.cloud.run.v2.Condition.State
diff --git a/run/apiv2/runpb/k8s.min.pb.go b/run/apiv2/runpb/k8s.min.pb.go
index bb42f43a2f1..0c76bb7a2a6 100644
--- a/run/apiv2/runpb/k8s.min.pb.go
+++ b/run/apiv2/runpb/k8s.min.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/run/v2/k8s.min.proto
 
 package runpb
diff --git a/run/apiv2/runpb/revision.pb.go b/run/apiv2/runpb/revision.pb.go
index 95f081a8d5d..dc5138d7260 100644
--- a/run/apiv2/runpb/revision.pb.go
+++ b/run/apiv2/runpb/revision.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/run/v2/revision.proto
 
 package runpb
@@ -25,8 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	api "google.golang.org/genproto/googleapis/api"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
@@ -35,6 +33,8 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -336,16 +336,16 @@ type Revision struct {
 	// KRM-style annotations for the resource.
 	Annotations map[string]string `protobuf:"bytes,5,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. For a deleted resource, the deletion time. It is only
 	// populated as a response to a Delete request.
-	DeleteTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
+	DeleteTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
 	// Output only. For a deleted resource, the time after which it will be
 	// permamently deleted. It is only populated as a response to a Delete
 	// request.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// Set the launch stage to a preview stage on write to allow use of preview
 	// features in that stage. On read, describes whether the resource uses
 	// preview features. Launch Stages are defined at [Google Cloud Platform
@@ -361,7 +361,7 @@ type Revision struct {
 	// Sets the maximum number of requests that each serving instance can receive.
 	MaxInstanceRequestConcurrency int32 `protobuf:"varint,34,opt,name=max_instance_request_concurrency,json=maxInstanceRequestConcurrency,proto3" json:"max_instance_request_concurrency,omitempty"`
 	// Max allowed time for an instance to respond to a request.
-	Timeout *duration.Duration `protobuf:"bytes,15,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,15,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Email address of the IAM service account associated with the revision of
 	// the service. The service account represents the identity of the running
 	// revision, and determines what permissions the revision has.
@@ -462,28 +462,28 @@ func (x *Revision) GetAnnotations() map[string]string {
 	return nil
 }
 
-func (x *Revision) GetCreateTime() *timestamp.Timestamp {
+func (x *Revision) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Revision) GetUpdateTime() *timestamp.Timestamp {
+func (x *Revision) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Revision) GetDeleteTime() *timestamp.Timestamp {
+func (x *Revision) GetDeleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeleteTime
 	}
 	return nil
 }
 
-func (x *Revision) GetExpireTime() *timestamp.Timestamp {
+func (x *Revision) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -525,7 +525,7 @@ func (x *Revision) GetMaxInstanceRequestConcurrency() int32 {
 	return 0
 }
 
-func (x *Revision) GetTimeout() *duration.Duration {
+func (x *Revision) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -849,11 +849,11 @@ var file_google_cloud_run_v2_revision_proto_goTypes = []interface{}{
 	(*Revision)(nil),              // 4: google.cloud.run.v2.Revision
 	nil,                           // 5: google.cloud.run.v2.Revision.LabelsEntry
 	nil,                           // 6: google.cloud.run.v2.Revision.AnnotationsEntry
-	(*timestamp.Timestamp)(nil),   // 7: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil), // 7: google.protobuf.Timestamp
 	(api.LaunchStage)(0),          // 8: google.api.LaunchStage
 	(*RevisionScaling)(nil),       // 9: google.cloud.run.v2.RevisionScaling
 	(*VpcAccess)(nil),             // 10: google.cloud.run.v2.VpcAccess
-	(*duration.Duration)(nil),     // 11: google.protobuf.Duration
+	(*durationpb.Duration)(nil),   // 11: google.protobuf.Duration
 	(*Container)(nil),             // 12: google.cloud.run.v2.Container
 	(*Volume)(nil),                // 13: google.cloud.run.v2.Volume
 	(ExecutionEnvironment)(0),     // 14: google.cloud.run.v2.ExecutionEnvironment
diff --git a/run/apiv2/runpb/revision_template.pb.go b/run/apiv2/runpb/revision_template.pb.go
index 8a9184678bd..014ce7e9322 100644
--- a/run/apiv2/runpb/revision_template.pb.go
+++ b/run/apiv2/runpb/revision_template.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/run/v2/revision_template.proto
 
 package runpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -57,7 +57,7 @@ type RevisionTemplate struct {
 	// visit https://cloud.google.com/run/docs/configuring/connecting-vpc.
 	VpcAccess *VpcAccess `protobuf:"bytes,6,opt,name=vpc_access,json=vpcAccess,proto3" json:"vpc_access,omitempty"`
 	// Max allowed time for an instance to respond to a request.
-	Timeout *duration.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,8,opt,name=timeout,proto3" json:"timeout,omitempty"`
 	// Email address of the IAM service account associated with the revision of
 	// the service. The service account represents the identity of the running
 	// revision, and determines what permissions the revision has. If not
@@ -145,7 +145,7 @@ func (x *RevisionTemplate) GetVpcAccess() *VpcAccess {
 	return nil
 }
 
-func (x *RevisionTemplate) GetTimeout() *duration.Duration {
+func (x *RevisionTemplate) GetTimeout() *durationpb.Duration {
 	if x != nil {
 		return x.Timeout
 	}
@@ -293,15 +293,15 @@ func file_google_cloud_run_v2_revision_template_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_run_v2_revision_template_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_google_cloud_run_v2_revision_template_proto_goTypes = []interface{}{
-	(*RevisionTemplate)(nil),  // 0: google.cloud.run.v2.RevisionTemplate
-	nil,                       // 1: google.cloud.run.v2.RevisionTemplate.LabelsEntry
-	nil,                       // 2: google.cloud.run.v2.RevisionTemplate.AnnotationsEntry
-	(*RevisionScaling)(nil),   // 3: google.cloud.run.v2.RevisionScaling
-	(*VpcAccess)(nil),         // 4: google.cloud.run.v2.VpcAccess
-	(*duration.Duration)(nil), // 5: google.protobuf.Duration
-	(*Container)(nil),         // 6: google.cloud.run.v2.Container
-	(*Volume)(nil),            // 7: google.cloud.run.v2.Volume
-	(ExecutionEnvironment)(0), // 8: google.cloud.run.v2.ExecutionEnvironment
+	(*RevisionTemplate)(nil),    // 0: google.cloud.run.v2.RevisionTemplate
+	nil,                         // 1: google.cloud.run.v2.RevisionTemplate.LabelsEntry
+	nil,                         // 2: google.cloud.run.v2.RevisionTemplate.AnnotationsEntry
+	(*RevisionScaling)(nil),     // 3: google.cloud.run.v2.RevisionScaling
+	(*VpcAccess)(nil),           // 4: google.cloud.run.v2.VpcAccess
+	(*durationpb.Duration)(nil), // 5: google.protobuf.Duration
+	(*Container)(nil),           // 6: google.cloud.run.v2.Container
+	(*Volume)(nil),              // 7: google.cloud.run.v2.Volume
+	(ExecutionEnvironment)(0),   // 8: google.cloud.run.v2.ExecutionEnvironment
 }
 var file_google_cloud_run_v2_revision_template_proto_depIdxs = []int32{
 	1, // 0: google.cloud.run.v2.RevisionTemplate.labels:type_name -> google.cloud.run.v2.RevisionTemplate.LabelsEntry
diff --git a/run/apiv2/runpb/service.pb.go b/run/apiv2/runpb/service.pb.go
index e1d39d5191b..fe8b4ca8309 100644
--- a/run/apiv2/runpb/service.pb.go
+++ b/run/apiv2/runpb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/run/v2/service.proto
 
 package runpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	api "google.golang.org/genproto/googleapis/api"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	v1 "google.golang.org/genproto/googleapis/iam/v1"
@@ -35,6 +34,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -500,14 +500,14 @@ type Service struct {
 	// https://kubernetes.io/docs/user-guide/annotations
 	Annotations map[string]string `protobuf:"bytes,6,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last-modified time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The deletion time.
-	DeleteTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
+	DeleteTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
 	// Output only. For a deleted resource, the time after which it will be
 	// permamently deleted.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// Output only. Email address of the authenticated creator.
 	Creator string `protobuf:"bytes,11,opt,name=creator,proto3" json:"creator,omitempty"`
 	// Output only. Email address of the last authenticated modifier.
@@ -664,28 +664,28 @@ func (x *Service) GetAnnotations() map[string]string {
 	return nil
 }
 
-func (x *Service) GetCreateTime() *timestamp.Timestamp {
+func (x *Service) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Service) GetUpdateTime() *timestamp.Timestamp {
+func (x *Service) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Service) GetDeleteTime() *timestamp.Timestamp {
+func (x *Service) GetDeleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeleteTime
 	}
 	return nil
 }
 
-func (x *Service) GetExpireTime() *timestamp.Timestamp {
+func (x *Service) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -1163,7 +1163,7 @@ var file_google_cloud_run_v2_service_proto_goTypes = []interface{}{
 	(*Service)(nil),                       // 6: google.cloud.run.v2.Service
 	nil,                                   // 7: google.cloud.run.v2.Service.LabelsEntry
 	nil,                                   // 8: google.cloud.run.v2.Service.AnnotationsEntry
-	(*timestamp.Timestamp)(nil),           // 9: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),         // 9: google.protobuf.Timestamp
 	(IngressTraffic)(0),                   // 10: google.cloud.run.v2.IngressTraffic
 	(api.LaunchStage)(0),                  // 11: google.api.LaunchStage
 	(*BinaryAuthorization)(nil),           // 12: google.cloud.run.v2.BinaryAuthorization
diff --git a/run/apiv2/runpb/traffic_target.pb.go b/run/apiv2/runpb/traffic_target.pb.go
index 894c5b8d48f..928741c71d8 100644
--- a/run/apiv2/runpb/traffic_target.pb.go
+++ b/run/apiv2/runpb/traffic_target.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/run/v2/traffic_target.proto
 
 package runpb
diff --git a/run/apiv2/runpb/vendor_settings.pb.go b/run/apiv2/runpb/vendor_settings.pb.go
index a5192d0cd63..7717985ad3a 100644
--- a/run/apiv2/runpb/vendor_settings.pb.go
+++ b/run/apiv2/runpb/vendor_settings.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/run/v2/vendor_settings.proto
 
 package runpb
diff --git a/run/apiv2/services_client.go b/run/apiv2/services_client.go
index 3cf32e4bb19..d3b63ecbf85 100644
--- a/run/apiv2/services_client.go
+++ b/run/apiv2/services_client.go
@@ -27,12 +27,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	runpb "cloud.google.com/go/run/apiv2/runpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	runpb "google.golang.org/genproto/googleapis/cloud/run/v2"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/run/apiv2/services_client_example_test.go b/run/apiv2/services_client_example_test.go
index 9d5bb433e6f..2701608d31b 100644
--- a/run/apiv2/services_client_example_test.go
+++ b/run/apiv2/services_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	run "cloud.google.com/go/run/apiv2"
+	runpb "cloud.google.com/go/run/apiv2/runpb"
 	"google.golang.org/api/iterator"
-	runpb "google.golang.org/genproto/googleapis/cloud/run/v2"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleServicesClient_CreateService() {
 
 	req := &runpb.CreateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#CreateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#CreateServiceRequest.
 	}
 	op, err := c.CreateService(ctx, req)
 	if err != nil {
@@ -88,7 +88,7 @@ func ExampleServicesClient_GetService() {
 
 	req := &runpb.GetServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#GetServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#GetServiceRequest.
 	}
 	resp, err := c.GetService(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleServicesClient_ListServices() {
 
 	req := &runpb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
@@ -144,7 +144,7 @@ func ExampleServicesClient_UpdateService() {
 
 	req := &runpb.UpdateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#UpdateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#UpdateServiceRequest.
 	}
 	op, err := c.UpdateService(ctx, req)
 	if err != nil {
@@ -174,7 +174,7 @@ func ExampleServicesClient_DeleteService() {
 
 	req := &runpb.DeleteServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/run/v2#DeleteServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/run/apiv2/runpb#DeleteServiceRequest.
 	}
 	op, err := c.DeleteService(ctx, req)
 	if err != nil {
diff --git a/run/go.mod b/run/go.mod
index b159a3bf5e4..6c2a457c597 100644
--- a/run/go.mod
+++ b/run/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/run
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/run/go.sum b/run/go.sum
index 4b329766226..197b62f3d3c 100644
--- a/run/go.sum
+++ b/run/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a h1:GH6UPn3ixhWcKDhpnEC55S75cerLPdpp3hrhfKYjZgw=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/scheduler/apiv1/cloud_scheduler_client.go b/scheduler/apiv1/cloud_scheduler_client.go
index 82be8249bbd..0ea1b13906c 100644
--- a/scheduler/apiv1/cloud_scheduler_client.go
+++ b/scheduler/apiv1/cloud_scheduler_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	schedulerpb "cloud.google.com/go/scheduler/apiv1/schedulerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	schedulerpb "google.golang.org/genproto/googleapis/cloud/scheduler/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/scheduler/apiv1/cloud_scheduler_client_example_test.go b/scheduler/apiv1/cloud_scheduler_client_example_test.go
index e1bc2b28917..7087d8aa2ca 100644
--- a/scheduler/apiv1/cloud_scheduler_client_example_test.go
+++ b/scheduler/apiv1/cloud_scheduler_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	scheduler "cloud.google.com/go/scheduler/apiv1"
+	schedulerpb "cloud.google.com/go/scheduler/apiv1/schedulerpb"
 	"google.golang.org/api/iterator"
-	schedulerpb "google.golang.org/genproto/googleapis/cloud/scheduler/v1"
 )
 
 func ExampleNewCloudSchedulerClient() {
@@ -56,7 +56,7 @@ func ExampleCloudSchedulerClient_ListJobs() {
 
 	req := &schedulerpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleCloudSchedulerClient_GetJob() {
 
 	req := &schedulerpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleCloudSchedulerClient_CreateJob() {
 
 	req := &schedulerpb.CreateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#CreateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#CreateJobRequest.
 	}
 	resp, err := c.CreateJob(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleCloudSchedulerClient_UpdateJob() {
 
 	req := &schedulerpb.UpdateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#UpdateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#UpdateJobRequest.
 	}
 	resp, err := c.UpdateJob(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleCloudSchedulerClient_DeleteJob() {
 
 	req := &schedulerpb.DeleteJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#DeleteJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#DeleteJobRequest.
 	}
 	err = c.DeleteJob(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleCloudSchedulerClient_PauseJob() {
 
 	req := &schedulerpb.PauseJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#PauseJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#PauseJobRequest.
 	}
 	resp, err := c.PauseJob(ctx, req)
 	if err != nil {
@@ -210,7 +210,7 @@ func ExampleCloudSchedulerClient_ResumeJob() {
 
 	req := &schedulerpb.ResumeJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#ResumeJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#ResumeJobRequest.
 	}
 	resp, err := c.ResumeJob(ctx, req)
 	if err != nil {
@@ -235,7 +235,7 @@ func ExampleCloudSchedulerClient_RunJob() {
 
 	req := &schedulerpb.RunJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#RunJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#RunJobRequest.
 	}
 	resp, err := c.RunJob(ctx, req)
 	if err != nil {
diff --git a/scheduler/apiv1/doc.go b/scheduler/apiv1/doc.go
index 10c6aa5f4f9..f527992413b 100644
--- a/scheduler/apiv1/doc.go
+++ b/scheduler/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &schedulerpb.ListJobsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/scheduler/v1#ListJobsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/scheduler/apiv1/schedulerpb#ListJobsRequest.
 //	}
 //	it := c.ListJobs(ctx, req)
 //	for {
diff --git a/scheduler/apiv1/schedulerpb/cloudscheduler.pb.go b/scheduler/apiv1/schedulerpb/cloudscheduler.pb.go
index b82242f676e..1d93161ba05 100644
--- a/scheduler/apiv1/schedulerpb/cloudscheduler.pb.go
+++ b/scheduler/apiv1/schedulerpb/cloudscheduler.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/scheduler/v1/cloudscheduler.proto
 
 package schedulerpb
@@ -26,14 +26,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -311,7 +311,7 @@ type UpdateJobRequest struct {
 	// Any value specified for an output only field will be ignored.
 	Job *Job `protobuf:"bytes,1,opt,name=job,proto3" json:"job,omitempty"`
 	// A  mask used to specify which fields of the job are being updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateJobRequest) Reset() {
@@ -353,7 +353,7 @@ func (x *UpdateJobRequest) GetJob() *Job {
 	return nil
 }
 
-func (x *UpdateJobRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateJobRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -751,18 +751,18 @@ func file_google_cloud_scheduler_v1_cloudscheduler_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_scheduler_v1_cloudscheduler_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
 var file_google_cloud_scheduler_v1_cloudscheduler_proto_goTypes = []interface{}{
-	(*ListJobsRequest)(nil),      // 0: google.cloud.scheduler.v1.ListJobsRequest
-	(*ListJobsResponse)(nil),     // 1: google.cloud.scheduler.v1.ListJobsResponse
-	(*GetJobRequest)(nil),        // 2: google.cloud.scheduler.v1.GetJobRequest
-	(*CreateJobRequest)(nil),     // 3: google.cloud.scheduler.v1.CreateJobRequest
-	(*UpdateJobRequest)(nil),     // 4: google.cloud.scheduler.v1.UpdateJobRequest
-	(*DeleteJobRequest)(nil),     // 5: google.cloud.scheduler.v1.DeleteJobRequest
-	(*PauseJobRequest)(nil),      // 6: google.cloud.scheduler.v1.PauseJobRequest
-	(*ResumeJobRequest)(nil),     // 7: google.cloud.scheduler.v1.ResumeJobRequest
-	(*RunJobRequest)(nil),        // 8: google.cloud.scheduler.v1.RunJobRequest
-	(*Job)(nil),                  // 9: google.cloud.scheduler.v1.Job
-	(*field_mask.FieldMask)(nil), // 10: google.protobuf.FieldMask
-	(*empty.Empty)(nil),          // 11: google.protobuf.Empty
+	(*ListJobsRequest)(nil),       // 0: google.cloud.scheduler.v1.ListJobsRequest
+	(*ListJobsResponse)(nil),      // 1: google.cloud.scheduler.v1.ListJobsResponse
+	(*GetJobRequest)(nil),         // 2: google.cloud.scheduler.v1.GetJobRequest
+	(*CreateJobRequest)(nil),      // 3: google.cloud.scheduler.v1.CreateJobRequest
+	(*UpdateJobRequest)(nil),      // 4: google.cloud.scheduler.v1.UpdateJobRequest
+	(*DeleteJobRequest)(nil),      // 5: google.cloud.scheduler.v1.DeleteJobRequest
+	(*PauseJobRequest)(nil),       // 6: google.cloud.scheduler.v1.PauseJobRequest
+	(*ResumeJobRequest)(nil),      // 7: google.cloud.scheduler.v1.ResumeJobRequest
+	(*RunJobRequest)(nil),         // 8: google.cloud.scheduler.v1.RunJobRequest
+	(*Job)(nil),                   // 9: google.cloud.scheduler.v1.Job
+	(*fieldmaskpb.FieldMask)(nil), // 10: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),         // 11: google.protobuf.Empty
 }
 var file_google_cloud_scheduler_v1_cloudscheduler_proto_depIdxs = []int32{
 	9,  // 0: google.cloud.scheduler.v1.ListJobsResponse.jobs:type_name -> google.cloud.scheduler.v1.Job
@@ -957,7 +957,7 @@ type CloudSchedulerClient interface {
 	// until a successful response is received.
 	UpdateJob(ctx context.Context, in *UpdateJobRequest, opts ...grpc.CallOption) (*Job, error)
 	// Deletes a job.
-	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Pauses a job.
 	//
 	// If a job is paused then the system will stop executing the job
@@ -1024,8 +1024,8 @@ func (c *cloudSchedulerClient) UpdateJob(ctx context.Context, in *UpdateJobReque
 	return out, nil
 }
 
-func (c *cloudSchedulerClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *cloudSchedulerClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.scheduler.v1.CloudScheduler/DeleteJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1079,7 +1079,7 @@ type CloudSchedulerServer interface {
 	// until a successful response is received.
 	UpdateJob(context.Context, *UpdateJobRequest) (*Job, error)
 	// Deletes a job.
-	DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error)
+	DeleteJob(context.Context, *DeleteJobRequest) (*emptypb.Empty, error)
 	// Pauses a job.
 	//
 	// If a job is paused then the system will stop executing the job
@@ -1118,7 +1118,7 @@ func (*UnimplementedCloudSchedulerServer) CreateJob(context.Context, *CreateJobR
 func (*UnimplementedCloudSchedulerServer) UpdateJob(context.Context, *UpdateJobRequest) (*Job, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateJob not implemented")
 }
-func (*UnimplementedCloudSchedulerServer) DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error) {
+func (*UnimplementedCloudSchedulerServer) DeleteJob(context.Context, *DeleteJobRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteJob not implemented")
 }
 func (*UnimplementedCloudSchedulerServer) PauseJob(context.Context, *PauseJobRequest) (*Job, error) {
diff --git a/scheduler/apiv1/schedulerpb/job.pb.go b/scheduler/apiv1/schedulerpb/job.pb.go
index 78844670d4f..67e799fcb80 100644
--- a/scheduler/apiv1/schedulerpb/job.pb.go
+++ b/scheduler/apiv1/schedulerpb/job.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/scheduler/v1/job.proto
 
 package schedulerpb
@@ -25,12 +25,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -182,7 +182,7 @@ type Job struct {
 	// as GMT).
 	TimeZone string `protobuf:"bytes,21,opt,name=time_zone,json=timeZone,proto3" json:"time_zone,omitempty"`
 	// Output only. The creation time of the job.
-	UserUpdateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=user_update_time,json=userUpdateTime,proto3" json:"user_update_time,omitempty"`
+	UserUpdateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=user_update_time,json=userUpdateTime,proto3" json:"user_update_time,omitempty"`
 	// Output only. State of the job.
 	State Job_State `protobuf:"varint,10,opt,name=state,proto3,enum=google.cloud.scheduler.v1.Job_State" json:"state,omitempty"`
 	// Output only. The response from the target for the last attempted execution.
@@ -190,9 +190,9 @@ type Job struct {
 	// Output only. The next time the job is scheduled. Note that this may be a
 	// retry of a previously failed attempt or the next execution time
 	// according to the schedule.
-	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,17,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	ScheduleTime *timestamppb.Timestamp `protobuf:"bytes,17,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
 	// Output only. The time the last job attempt started.
-	LastAttemptTime *timestamp.Timestamp `protobuf:"bytes,18,opt,name=last_attempt_time,json=lastAttemptTime,proto3" json:"last_attempt_time,omitempty"`
+	LastAttemptTime *timestamppb.Timestamp `protobuf:"bytes,18,opt,name=last_attempt_time,json=lastAttemptTime,proto3" json:"last_attempt_time,omitempty"`
 	// Settings that determine the retry behavior.
 	RetryConfig *RetryConfig `protobuf:"bytes,19,opt,name=retry_config,json=retryConfig,proto3" json:"retry_config,omitempty"`
 	// The deadline for job attempts. If the request handler does not respond by
@@ -205,7 +205,7 @@ type Job struct {
 	//   - For [HTTP targets][google.cloud.scheduler.v1.Job.http_target], between 15 seconds and 30 minutes.
 	//   - For [App Engine HTTP targets][google.cloud.scheduler.v1.Job.app_engine_http_target], between 15
 	//     seconds and 24 hours.
-	AttemptDeadline *duration.Duration `protobuf:"bytes,22,opt,name=attempt_deadline,json=attemptDeadline,proto3" json:"attempt_deadline,omitempty"`
+	AttemptDeadline *durationpb.Duration `protobuf:"bytes,22,opt,name=attempt_deadline,json=attemptDeadline,proto3" json:"attempt_deadline,omitempty"`
 }
 
 func (x *Job) Reset() {
@@ -296,7 +296,7 @@ func (x *Job) GetTimeZone() string {
 	return ""
 }
 
-func (x *Job) GetUserUpdateTime() *timestamp.Timestamp {
+func (x *Job) GetUserUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UserUpdateTime
 	}
@@ -317,14 +317,14 @@ func (x *Job) GetStatus() *status.Status {
 	return nil
 }
 
-func (x *Job) GetScheduleTime() *timestamp.Timestamp {
+func (x *Job) GetScheduleTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ScheduleTime
 	}
 	return nil
 }
 
-func (x *Job) GetLastAttemptTime() *timestamp.Timestamp {
+func (x *Job) GetLastAttemptTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastAttemptTime
 	}
@@ -338,7 +338,7 @@ func (x *Job) GetRetryConfig() *RetryConfig {
 	return nil
 }
 
-func (x *Job) GetAttemptDeadline() *duration.Duration {
+func (x *Job) GetAttemptDeadline() *durationpb.Duration {
 	if x != nil {
 		return x.AttemptDeadline
 	}
@@ -404,17 +404,17 @@ type RetryConfig struct {
 	//
 	// The default value for max_retry_duration is zero, which means retry
 	// duration is unlimited.
-	MaxRetryDuration *duration.Duration `protobuf:"bytes,2,opt,name=max_retry_duration,json=maxRetryDuration,proto3" json:"max_retry_duration,omitempty"`
+	MaxRetryDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=max_retry_duration,json=maxRetryDuration,proto3" json:"max_retry_duration,omitempty"`
 	// The minimum amount of time to wait before retrying a job after
 	// it fails.
 	//
 	// The default value of this field is 5 seconds.
-	MinBackoffDuration *duration.Duration `protobuf:"bytes,3,opt,name=min_backoff_duration,json=minBackoffDuration,proto3" json:"min_backoff_duration,omitempty"`
+	MinBackoffDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=min_backoff_duration,json=minBackoffDuration,proto3" json:"min_backoff_duration,omitempty"`
 	// The maximum amount of time to wait before retrying a job after
 	// it fails.
 	//
 	// The default value of this field is 1 hour.
-	MaxBackoffDuration *duration.Duration `protobuf:"bytes,4,opt,name=max_backoff_duration,json=maxBackoffDuration,proto3" json:"max_backoff_duration,omitempty"`
+	MaxBackoffDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=max_backoff_duration,json=maxBackoffDuration,proto3" json:"max_backoff_duration,omitempty"`
 	// The time between retries will double `max_doublings` times.
 	//
 	// A job's retry interval starts at
@@ -476,21 +476,21 @@ func (x *RetryConfig) GetRetryCount() int32 {
 	return 0
 }
 
-func (x *RetryConfig) GetMaxRetryDuration() *duration.Duration {
+func (x *RetryConfig) GetMaxRetryDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MaxRetryDuration
 	}
 	return nil
 }
 
-func (x *RetryConfig) GetMinBackoffDuration() *duration.Duration {
+func (x *RetryConfig) GetMinBackoffDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MinBackoffDuration
 	}
 	return nil
 }
 
-func (x *RetryConfig) GetMaxBackoffDuration() *duration.Duration {
+func (x *RetryConfig) GetMaxBackoffDuration() *durationpb.Duration {
 	if x != nil {
 		return x.MaxBackoffDuration
 	}
@@ -629,15 +629,15 @@ func file_google_cloud_scheduler_v1_job_proto_rawDescGZIP() []byte {
 var file_google_cloud_scheduler_v1_job_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_scheduler_v1_job_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_cloud_scheduler_v1_job_proto_goTypes = []interface{}{
-	(Job_State)(0),              // 0: google.cloud.scheduler.v1.Job.State
-	(*Job)(nil),                 // 1: google.cloud.scheduler.v1.Job
-	(*RetryConfig)(nil),         // 2: google.cloud.scheduler.v1.RetryConfig
-	(*PubsubTarget)(nil),        // 3: google.cloud.scheduler.v1.PubsubTarget
-	(*AppEngineHttpTarget)(nil), // 4: google.cloud.scheduler.v1.AppEngineHttpTarget
-	(*HttpTarget)(nil),          // 5: google.cloud.scheduler.v1.HttpTarget
-	(*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp
-	(*status.Status)(nil),       // 7: google.rpc.Status
-	(*duration.Duration)(nil),   // 8: google.protobuf.Duration
+	(Job_State)(0),                // 0: google.cloud.scheduler.v1.Job.State
+	(*Job)(nil),                   // 1: google.cloud.scheduler.v1.Job
+	(*RetryConfig)(nil),           // 2: google.cloud.scheduler.v1.RetryConfig
+	(*PubsubTarget)(nil),          // 3: google.cloud.scheduler.v1.PubsubTarget
+	(*AppEngineHttpTarget)(nil),   // 4: google.cloud.scheduler.v1.AppEngineHttpTarget
+	(*HttpTarget)(nil),            // 5: google.cloud.scheduler.v1.HttpTarget
+	(*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp
+	(*status.Status)(nil),         // 7: google.rpc.Status
+	(*durationpb.Duration)(nil),   // 8: google.protobuf.Duration
 }
 var file_google_cloud_scheduler_v1_job_proto_depIdxs = []int32{
 	3,  // 0: google.cloud.scheduler.v1.Job.pubsub_target:type_name -> google.cloud.scheduler.v1.PubsubTarget
diff --git a/scheduler/apiv1/schedulerpb/target.pb.go b/scheduler/apiv1/schedulerpb/target.pb.go
index 4a87a346874..e58c1ad7574 100644
--- a/scheduler/apiv1/schedulerpb/target.pb.go
+++ b/scheduler/apiv1/schedulerpb/target.pb.go
@@ -16,7 +16,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/scheduler/v1/target.proto
 
 package schedulerpb
diff --git a/scheduler/go.mod b/scheduler/go.mod
index 11c4a932fdb..50e5c8b2cfc 100644
--- a/scheduler/go.mod
+++ b/scheduler/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/scheduler/go.sum b/scheduler/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/scheduler/go.sum
+++ b/scheduler/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/secretmanager/apiv1/doc.go b/secretmanager/apiv1/doc.go
index b0943175051..4087b58523a 100644
--- a/secretmanager/apiv1/doc.go
+++ b/secretmanager/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &secretmanagerpb.ListSecretsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#ListSecretsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#ListSecretsRequest.
 //	}
 //	it := c.ListSecrets(ctx, req)
 //	for {
diff --git a/secretmanager/apiv1/secret_manager_client.go b/secretmanager/apiv1/secret_manager_client.go
index 79fc9ebf019..b08ed1c3244 100644
--- a/secretmanager/apiv1/secret_manager_client.go
+++ b/secretmanager/apiv1/secret_manager_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	secretmanagerpb "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	secretmanagerpb "google.golang.org/genproto/googleapis/cloud/secretmanager/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/secretmanager/apiv1/secret_manager_client_example_test.go b/secretmanager/apiv1/secret_manager_client_example_test.go
index e3d6c5d5e01..8605703794f 100644
--- a/secretmanager/apiv1/secret_manager_client_example_test.go
+++ b/secretmanager/apiv1/secret_manager_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	secretmanager "cloud.google.com/go/secretmanager/apiv1"
+	secretmanagerpb "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb"
 	"google.golang.org/api/iterator"
-	secretmanagerpb "google.golang.org/genproto/googleapis/cloud/secretmanager/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleClient_ListSecrets() {
 
 	req := &secretmanagerpb.ListSecretsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#ListSecretsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#ListSecretsRequest.
 	}
 	it := c.ListSecrets(ctx, req)
 	for {
@@ -88,7 +88,7 @@ func ExampleClient_CreateSecret() {
 
 	req := &secretmanagerpb.CreateSecretRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#CreateSecretRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#CreateSecretRequest.
 	}
 	resp, err := c.CreateSecret(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleClient_AddSecretVersion() {
 
 	req := &secretmanagerpb.AddSecretVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#AddSecretVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#AddSecretVersionRequest.
 	}
 	resp, err := c.AddSecretVersion(ctx, req)
 	if err != nil {
@@ -138,7 +138,7 @@ func ExampleClient_GetSecret() {
 
 	req := &secretmanagerpb.GetSecretRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#GetSecretRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#GetSecretRequest.
 	}
 	resp, err := c.GetSecret(ctx, req)
 	if err != nil {
@@ -163,7 +163,7 @@ func ExampleClient_UpdateSecret() {
 
 	req := &secretmanagerpb.UpdateSecretRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#UpdateSecretRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#UpdateSecretRequest.
 	}
 	resp, err := c.UpdateSecret(ctx, req)
 	if err != nil {
@@ -188,7 +188,7 @@ func ExampleClient_DeleteSecret() {
 
 	req := &secretmanagerpb.DeleteSecretRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#DeleteSecretRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#DeleteSecretRequest.
 	}
 	err = c.DeleteSecret(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExampleClient_ListSecretVersions() {
 
 	req := &secretmanagerpb.ListSecretVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#ListSecretVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#ListSecretVersionsRequest.
 	}
 	it := c.ListSecretVersions(ctx, req)
 	for {
@@ -242,7 +242,7 @@ func ExampleClient_GetSecretVersion() {
 
 	req := &secretmanagerpb.GetSecretVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#GetSecretVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#GetSecretVersionRequest.
 	}
 	resp, err := c.GetSecretVersion(ctx, req)
 	if err != nil {
@@ -267,7 +267,7 @@ func ExampleClient_AccessSecretVersion() {
 
 	req := &secretmanagerpb.AccessSecretVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#AccessSecretVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#AccessSecretVersionRequest.
 	}
 	resp, err := c.AccessSecretVersion(ctx, req)
 	if err != nil {
@@ -292,7 +292,7 @@ func ExampleClient_DisableSecretVersion() {
 
 	req := &secretmanagerpb.DisableSecretVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#DisableSecretVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#DisableSecretVersionRequest.
 	}
 	resp, err := c.DisableSecretVersion(ctx, req)
 	if err != nil {
@@ -317,7 +317,7 @@ func ExampleClient_EnableSecretVersion() {
 
 	req := &secretmanagerpb.EnableSecretVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#EnableSecretVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#EnableSecretVersionRequest.
 	}
 	resp, err := c.EnableSecretVersion(ctx, req)
 	if err != nil {
@@ -342,7 +342,7 @@ func ExampleClient_DestroySecretVersion() {
 
 	req := &secretmanagerpb.DestroySecretVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/secretmanager/v1#DestroySecretVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/secretmanager/apiv1/secretmanagerpb#DestroySecretVersionRequest.
 	}
 	resp, err := c.DestroySecretVersion(ctx, req)
 	if err != nil {
diff --git a/secretmanager/apiv1/secretmanagerpb/resources.pb.go b/secretmanager/apiv1/secretmanagerpb/resources.pb.go
index d8c4db05f79..6c3cbc33d67 100644
--- a/secretmanager/apiv1/secretmanagerpb/resources.pb.go
+++ b/secretmanager/apiv1/secretmanagerpb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/secretmanager/v1/resources.proto
 
 package secretmanagerpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -115,7 +115,7 @@ type Secret struct {
 	// The replication policy cannot be changed after the Secret has been created.
 	Replication *Replication `protobuf:"bytes,2,opt,name=replication,proto3" json:"replication,omitempty"`
 	// Output only. The time at which the [Secret][google.cloud.secretmanager.v1.Secret] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The labels assigned to this Secret.
 	//
 	// Label keys must be between 1 and 63 characters long, have a UTF-8 encoding
@@ -210,7 +210,7 @@ func (x *Secret) GetReplication() *Replication {
 	return nil
 }
 
-func (x *Secret) GetCreateTime() *timestamp.Timestamp {
+func (x *Secret) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -238,14 +238,14 @@ func (m *Secret) GetExpiration() isSecret_Expiration {
 	return nil
 }
 
-func (x *Secret) GetExpireTime() *timestamp.Timestamp {
+func (x *Secret) GetExpireTime() *timestamppb.Timestamp {
 	if x, ok := x.GetExpiration().(*Secret_ExpireTime); ok {
 		return x.ExpireTime
 	}
 	return nil
 }
 
-func (x *Secret) GetTtl() *duration.Duration {
+func (x *Secret) GetTtl() *durationpb.Duration {
 	if x, ok := x.GetExpiration().(*Secret_Ttl); ok {
 		return x.Ttl
 	}
@@ -280,12 +280,12 @@ type isSecret_Expiration interface {
 type Secret_ExpireTime struct {
 	// Optional. Timestamp in UTC when the [Secret][google.cloud.secretmanager.v1.Secret] is scheduled to expire. This is
 	// always provided on output, regardless of what was sent on input.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=expire_time,json=expireTime,proto3,oneof"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=expire_time,json=expireTime,proto3,oneof"`
 }
 
 type Secret_Ttl struct {
 	// Input only. The TTL for the [Secret][google.cloud.secretmanager.v1.Secret].
-	Ttl *duration.Duration `protobuf:"bytes,7,opt,name=ttl,proto3,oneof"`
+	Ttl *durationpb.Duration `protobuf:"bytes,7,opt,name=ttl,proto3,oneof"`
 }
 
 func (*Secret_ExpireTime) isSecret_Expiration() {}
@@ -305,11 +305,11 @@ type SecretVersion struct {
 	// are incremented for each subsequent version of the secret.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The time at which the [SecretVersion][google.cloud.secretmanager.v1.SecretVersion] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time this [SecretVersion][google.cloud.secretmanager.v1.SecretVersion] was destroyed.
 	// Only present if [state][google.cloud.secretmanager.v1.SecretVersion.state] is
 	// [DESTROYED][google.cloud.secretmanager.v1.SecretVersion.State.DESTROYED].
-	DestroyTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=destroy_time,json=destroyTime,proto3" json:"destroy_time,omitempty"`
+	DestroyTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=destroy_time,json=destroyTime,proto3" json:"destroy_time,omitempty"`
 	// Output only. The current state of the [SecretVersion][google.cloud.secretmanager.v1.SecretVersion].
 	State SecretVersion_State `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.secretmanager.v1.SecretVersion_State" json:"state,omitempty"`
 	// The replication status of the [SecretVersion][google.cloud.secretmanager.v1.SecretVersion].
@@ -361,14 +361,14 @@ func (x *SecretVersion) GetName() string {
 	return ""
 }
 
-func (x *SecretVersion) GetCreateTime() *timestamp.Timestamp {
+func (x *SecretVersion) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *SecretVersion) GetDestroyTime() *timestamp.Timestamp {
+func (x *SecretVersion) GetDestroyTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DestroyTime
 	}
@@ -759,14 +759,14 @@ type Rotation struct {
 	// years).
 	//
 	// [next_rotation_time][google.cloud.secretmanager.v1.Rotation.next_rotation_time] MUST  be set if [rotation_period][google.cloud.secretmanager.v1.Rotation.rotation_period] is set.
-	NextRotationTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=next_rotation_time,json=nextRotationTime,proto3" json:"next_rotation_time,omitempty"`
+	NextRotationTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=next_rotation_time,json=nextRotationTime,proto3" json:"next_rotation_time,omitempty"`
 	// Input only. The Duration between rotation notifications. Must be in seconds
 	// and at least 3600s (1h) and at most 3153600000s (100 years).
 	//
 	// If [rotation_period][google.cloud.secretmanager.v1.Rotation.rotation_period] is set, [next_rotation_time][google.cloud.secretmanager.v1.Rotation.next_rotation_time] must be set.
 	// [next_rotation_time][google.cloud.secretmanager.v1.Rotation.next_rotation_time] will be advanced by this period when the service
 	// automatically sends rotation notifications.
-	RotationPeriod *duration.Duration `protobuf:"bytes,2,opt,name=rotation_period,json=rotationPeriod,proto3" json:"rotation_period,omitempty"`
+	RotationPeriod *durationpb.Duration `protobuf:"bytes,2,opt,name=rotation_period,json=rotationPeriod,proto3" json:"rotation_period,omitempty"`
 }
 
 func (x *Rotation) Reset() {
@@ -801,14 +801,14 @@ func (*Rotation) Descriptor() ([]byte, []int) {
 	return file_google_cloud_secretmanager_v1_resources_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *Rotation) GetNextRotationTime() *timestamp.Timestamp {
+func (x *Rotation) GetNextRotationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NextRotationTime
 	}
 	return nil
 }
 
-func (x *Rotation) GetRotationPeriod() *duration.Duration {
+func (x *Rotation) GetRotationPeriod() *durationpb.Duration {
 	if x != nil {
 		return x.RotationPeriod
 	}
@@ -1500,8 +1500,8 @@ var file_google_cloud_secretmanager_v1_resources_proto_goTypes = []interface{}{
 	(*ReplicationStatus_AutomaticStatus)(nil),   // 15: google.cloud.secretmanager.v1.ReplicationStatus.AutomaticStatus
 	(*ReplicationStatus_UserManagedStatus)(nil), // 16: google.cloud.secretmanager.v1.ReplicationStatus.UserManagedStatus
 	(*ReplicationStatus_UserManagedStatus_ReplicaStatus)(nil), // 17: google.cloud.secretmanager.v1.ReplicationStatus.UserManagedStatus.ReplicaStatus
-	(*timestamp.Timestamp)(nil),                               // 18: google.protobuf.Timestamp
-	(*duration.Duration)(nil),                                 // 19: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                             // 18: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                               // 19: google.protobuf.Duration
 }
 var file_google_cloud_secretmanager_v1_resources_proto_depIdxs = []int32{
 	3,  // 0: google.cloud.secretmanager.v1.Secret.replication:type_name -> google.cloud.secretmanager.v1.Replication
diff --git a/secretmanager/apiv1/secretmanagerpb/service.pb.go b/secretmanager/apiv1/secretmanagerpb/service.pb.go
index cf5019b1f58..47d75bdb788 100644
--- a/secretmanager/apiv1/secretmanagerpb/service.pb.go
+++ b/secretmanager/apiv1/secretmanagerpb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/secretmanager/v1/service.proto
 
 package secretmanagerpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -592,7 +592,7 @@ type UpdateSecretRequest struct {
 	// Required. [Secret][google.cloud.secretmanager.v1.Secret] with updated field values.
 	Secret *Secret `protobuf:"bytes,1,opt,name=secret,proto3" json:"secret,omitempty"`
 	// Required. Specifies the fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSecretRequest) Reset() {
@@ -634,7 +634,7 @@ func (x *UpdateSecretRequest) GetSecret() *Secret {
 	return nil
 }
 
-func (x *UpdateSecretRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSecretRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1384,11 +1384,11 @@ var file_google_cloud_secretmanager_v1_service_proto_goTypes = []interface{}{
 	(*Secret)(nil),                        // 15: google.cloud.secretmanager.v1.Secret
 	(*SecretPayload)(nil),                 // 16: google.cloud.secretmanager.v1.SecretPayload
 	(*SecretVersion)(nil),                 // 17: google.cloud.secretmanager.v1.SecretVersion
-	(*field_mask.FieldMask)(nil),          // 18: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),         // 18: google.protobuf.FieldMask
 	(*v1.SetIamPolicyRequest)(nil),        // 19: google.iam.v1.SetIamPolicyRequest
 	(*v1.GetIamPolicyRequest)(nil),        // 20: google.iam.v1.GetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 21: google.iam.v1.TestIamPermissionsRequest
-	(*empty.Empty)(nil),                   // 22: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                 // 22: google.protobuf.Empty
 	(*v1.Policy)(nil),                     // 23: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil), // 24: google.iam.v1.TestIamPermissionsResponse
 }
@@ -1669,7 +1669,7 @@ type SecretManagerServiceClient interface {
 	// Updates metadata of an existing [Secret][google.cloud.secretmanager.v1.Secret].
 	UpdateSecret(ctx context.Context, in *UpdateSecretRequest, opts ...grpc.CallOption) (*Secret, error)
 	// Deletes a [Secret][google.cloud.secretmanager.v1.Secret].
-	DeleteSecret(ctx context.Context, in *DeleteSecretRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteSecret(ctx context.Context, in *DeleteSecretRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists [SecretVersions][google.cloud.secretmanager.v1.SecretVersion]. This call does not return secret
 	// data.
 	ListSecretVersions(ctx context.Context, in *ListSecretVersionsRequest, opts ...grpc.CallOption) (*ListSecretVersionsResponse, error)
@@ -1771,8 +1771,8 @@ func (c *secretManagerServiceClient) UpdateSecret(ctx context.Context, in *Updat
 	return out, nil
 }
 
-func (c *secretManagerServiceClient) DeleteSecret(ctx context.Context, in *DeleteSecretRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *secretManagerServiceClient) DeleteSecret(ctx context.Context, in *DeleteSecretRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.secretmanager.v1.SecretManagerService/DeleteSecret", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1875,7 +1875,7 @@ type SecretManagerServiceServer interface {
 	// Updates metadata of an existing [Secret][google.cloud.secretmanager.v1.Secret].
 	UpdateSecret(context.Context, *UpdateSecretRequest) (*Secret, error)
 	// Deletes a [Secret][google.cloud.secretmanager.v1.Secret].
-	DeleteSecret(context.Context, *DeleteSecretRequest) (*empty.Empty, error)
+	DeleteSecret(context.Context, *DeleteSecretRequest) (*emptypb.Empty, error)
 	// Lists [SecretVersions][google.cloud.secretmanager.v1.SecretVersion]. This call does not return secret
 	// data.
 	ListSecretVersions(context.Context, *ListSecretVersionsRequest) (*ListSecretVersionsResponse, error)
@@ -1943,7 +1943,7 @@ func (*UnimplementedSecretManagerServiceServer) GetSecret(context.Context, *GetS
 func (*UnimplementedSecretManagerServiceServer) UpdateSecret(context.Context, *UpdateSecretRequest) (*Secret, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateSecret not implemented")
 }
-func (*UnimplementedSecretManagerServiceServer) DeleteSecret(context.Context, *DeleteSecretRequest) (*empty.Empty, error) {
+func (*UnimplementedSecretManagerServiceServer) DeleteSecret(context.Context, *DeleteSecretRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteSecret not implemented")
 }
 func (*UnimplementedSecretManagerServiceServer) ListSecretVersions(context.Context, *ListSecretVersionsRequest) (*ListSecretVersionsResponse, error) {
diff --git a/secretmanager/go.mod b/secretmanager/go.mod
index 680363b3525..646a4025ff9 100644
--- a/secretmanager/go.mod
+++ b/secretmanager/go.mod
@@ -3,11 +3,10 @@ module cloud.google.com/go/secretmanager
 go 1.19
 
 require (
-	cloud.google.com/go/iam v0.5.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/iam v0.6.0
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -15,12 +14,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/secretmanager/go.sum b/secretmanager/go.sum
index 368532d1f5c..d3ab5d8bb7d 100644
--- a/secretmanager/go.sum
+++ b/secretmanager/go.sum
@@ -1,9 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
-cloud.google.com/go/iam v0.5.0 h1:fz9X5zyTWBmamZsqvqZqD7khbifcZF/q+Z1J8pfhIUg=
-cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
+cloud.google.com/go/iam v0.6.0 h1:nsqQC88kT5Iwlm4MeNGTpfMWddp6NB/UOLFTH6m1QfQ=
+cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -63,8 +64,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -80,8 +81,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -97,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/security/go.mod b/security/go.mod
index e9b3d3bc7c6..401a3c5cd38 100644
--- a/security/go.mod
+++ b/security/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/security
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/security/go.sum b/security/go.sum
index 4b329766226..197b62f3d3c 100644
--- a/security/go.sum
+++ b/security/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a h1:GH6UPn3ixhWcKDhpnEC55S75cerLPdpp3hrhfKYjZgw=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/security/privateca/apiv1/certificate_authority_client.go b/security/privateca/apiv1/certificate_authority_client.go
index 297bed8c683..6d460739bd2 100644
--- a/security/privateca/apiv1/certificate_authority_client.go
+++ b/security/privateca/apiv1/certificate_authority_client.go
@@ -25,13 +25,13 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	privatecapb "cloud.google.com/go/security/privateca/apiv1/privatecapb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
-	privatecapb "google.golang.org/genproto/googleapis/cloud/security/privateca/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
diff --git a/security/privateca/apiv1/certificate_authority_client_example_test.go b/security/privateca/apiv1/certificate_authority_client_example_test.go
index 33ac0533b55..94563b567b0 100644
--- a/security/privateca/apiv1/certificate_authority_client_example_test.go
+++ b/security/privateca/apiv1/certificate_authority_client_example_test.go
@@ -20,9 +20,9 @@ import (
 	"context"
 
 	privateca "cloud.google.com/go/security/privateca/apiv1"
+	privatecapb "cloud.google.com/go/security/privateca/apiv1/privatecapb"
 	"google.golang.org/api/iterator"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
-	privatecapb "google.golang.org/genproto/googleapis/cloud/security/privateca/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -58,7 +58,7 @@ func ExampleCertificateAuthorityClient_CreateCertificate() {
 
 	req := &privatecapb.CreateCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#CreateCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#CreateCertificateRequest.
 	}
 	resp, err := c.CreateCertificate(ctx, req)
 	if err != nil {
@@ -83,7 +83,7 @@ func ExampleCertificateAuthorityClient_GetCertificate() {
 
 	req := &privatecapb.GetCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#GetCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#GetCertificateRequest.
 	}
 	resp, err := c.GetCertificate(ctx, req)
 	if err != nil {
@@ -108,7 +108,7 @@ func ExampleCertificateAuthorityClient_ListCertificates() {
 
 	req := &privatecapb.ListCertificatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#ListCertificatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#ListCertificatesRequest.
 	}
 	it := c.ListCertificates(ctx, req)
 	for {
@@ -139,7 +139,7 @@ func ExampleCertificateAuthorityClient_RevokeCertificate() {
 
 	req := &privatecapb.RevokeCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#RevokeCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#RevokeCertificateRequest.
 	}
 	resp, err := c.RevokeCertificate(ctx, req)
 	if err != nil {
@@ -164,7 +164,7 @@ func ExampleCertificateAuthorityClient_UpdateCertificate() {
 
 	req := &privatecapb.UpdateCertificateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#UpdateCertificateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#UpdateCertificateRequest.
 	}
 	resp, err := c.UpdateCertificate(ctx, req)
 	if err != nil {
@@ -189,7 +189,7 @@ func ExampleCertificateAuthorityClient_ActivateCertificateAuthority() {
 
 	req := &privatecapb.ActivateCertificateAuthorityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#ActivateCertificateAuthorityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#ActivateCertificateAuthorityRequest.
 	}
 	op, err := c.ActivateCertificateAuthority(ctx, req)
 	if err != nil {
@@ -219,7 +219,7 @@ func ExampleCertificateAuthorityClient_CreateCertificateAuthority() {
 
 	req := &privatecapb.CreateCertificateAuthorityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#CreateCertificateAuthorityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#CreateCertificateAuthorityRequest.
 	}
 	op, err := c.CreateCertificateAuthority(ctx, req)
 	if err != nil {
@@ -249,7 +249,7 @@ func ExampleCertificateAuthorityClient_DisableCertificateAuthority() {
 
 	req := &privatecapb.DisableCertificateAuthorityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#DisableCertificateAuthorityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#DisableCertificateAuthorityRequest.
 	}
 	op, err := c.DisableCertificateAuthority(ctx, req)
 	if err != nil {
@@ -279,7 +279,7 @@ func ExampleCertificateAuthorityClient_EnableCertificateAuthority() {
 
 	req := &privatecapb.EnableCertificateAuthorityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#EnableCertificateAuthorityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#EnableCertificateAuthorityRequest.
 	}
 	op, err := c.EnableCertificateAuthority(ctx, req)
 	if err != nil {
@@ -309,7 +309,7 @@ func ExampleCertificateAuthorityClient_FetchCertificateAuthorityCsr() {
 
 	req := &privatecapb.FetchCertificateAuthorityCsrRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#FetchCertificateAuthorityCsrRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#FetchCertificateAuthorityCsrRequest.
 	}
 	resp, err := c.FetchCertificateAuthorityCsr(ctx, req)
 	if err != nil {
@@ -334,7 +334,7 @@ func ExampleCertificateAuthorityClient_GetCertificateAuthority() {
 
 	req := &privatecapb.GetCertificateAuthorityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#GetCertificateAuthorityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#GetCertificateAuthorityRequest.
 	}
 	resp, err := c.GetCertificateAuthority(ctx, req)
 	if err != nil {
@@ -359,7 +359,7 @@ func ExampleCertificateAuthorityClient_ListCertificateAuthorities() {
 
 	req := &privatecapb.ListCertificateAuthoritiesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#ListCertificateAuthoritiesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#ListCertificateAuthoritiesRequest.
 	}
 	it := c.ListCertificateAuthorities(ctx, req)
 	for {
@@ -390,7 +390,7 @@ func ExampleCertificateAuthorityClient_UndeleteCertificateAuthority() {
 
 	req := &privatecapb.UndeleteCertificateAuthorityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#UndeleteCertificateAuthorityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#UndeleteCertificateAuthorityRequest.
 	}
 	op, err := c.UndeleteCertificateAuthority(ctx, req)
 	if err != nil {
@@ -420,7 +420,7 @@ func ExampleCertificateAuthorityClient_DeleteCertificateAuthority() {
 
 	req := &privatecapb.DeleteCertificateAuthorityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#DeleteCertificateAuthorityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#DeleteCertificateAuthorityRequest.
 	}
 	op, err := c.DeleteCertificateAuthority(ctx, req)
 	if err != nil {
@@ -450,7 +450,7 @@ func ExampleCertificateAuthorityClient_UpdateCertificateAuthority() {
 
 	req := &privatecapb.UpdateCertificateAuthorityRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#UpdateCertificateAuthorityRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#UpdateCertificateAuthorityRequest.
 	}
 	op, err := c.UpdateCertificateAuthority(ctx, req)
 	if err != nil {
@@ -480,7 +480,7 @@ func ExampleCertificateAuthorityClient_CreateCaPool() {
 
 	req := &privatecapb.CreateCaPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#CreateCaPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#CreateCaPoolRequest.
 	}
 	op, err := c.CreateCaPool(ctx, req)
 	if err != nil {
@@ -510,7 +510,7 @@ func ExampleCertificateAuthorityClient_UpdateCaPool() {
 
 	req := &privatecapb.UpdateCaPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#UpdateCaPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#UpdateCaPoolRequest.
 	}
 	op, err := c.UpdateCaPool(ctx, req)
 	if err != nil {
@@ -540,7 +540,7 @@ func ExampleCertificateAuthorityClient_GetCaPool() {
 
 	req := &privatecapb.GetCaPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#GetCaPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#GetCaPoolRequest.
 	}
 	resp, err := c.GetCaPool(ctx, req)
 	if err != nil {
@@ -565,7 +565,7 @@ func ExampleCertificateAuthorityClient_ListCaPools() {
 
 	req := &privatecapb.ListCaPoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#ListCaPoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#ListCaPoolsRequest.
 	}
 	it := c.ListCaPools(ctx, req)
 	for {
@@ -596,7 +596,7 @@ func ExampleCertificateAuthorityClient_DeleteCaPool() {
 
 	req := &privatecapb.DeleteCaPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#DeleteCaPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#DeleteCaPoolRequest.
 	}
 	op, err := c.DeleteCaPool(ctx, req)
 	if err != nil {
@@ -624,7 +624,7 @@ func ExampleCertificateAuthorityClient_FetchCaCerts() {
 
 	req := &privatecapb.FetchCaCertsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#FetchCaCertsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#FetchCaCertsRequest.
 	}
 	resp, err := c.FetchCaCerts(ctx, req)
 	if err != nil {
@@ -649,7 +649,7 @@ func ExampleCertificateAuthorityClient_GetCertificateRevocationList() {
 
 	req := &privatecapb.GetCertificateRevocationListRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#GetCertificateRevocationListRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#GetCertificateRevocationListRequest.
 	}
 	resp, err := c.GetCertificateRevocationList(ctx, req)
 	if err != nil {
@@ -674,7 +674,7 @@ func ExampleCertificateAuthorityClient_ListCertificateRevocationLists() {
 
 	req := &privatecapb.ListCertificateRevocationListsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#ListCertificateRevocationListsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#ListCertificateRevocationListsRequest.
 	}
 	it := c.ListCertificateRevocationLists(ctx, req)
 	for {
@@ -705,7 +705,7 @@ func ExampleCertificateAuthorityClient_UpdateCertificateRevocationList() {
 
 	req := &privatecapb.UpdateCertificateRevocationListRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#UpdateCertificateRevocationListRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#UpdateCertificateRevocationListRequest.
 	}
 	op, err := c.UpdateCertificateRevocationList(ctx, req)
 	if err != nil {
@@ -735,7 +735,7 @@ func ExampleCertificateAuthorityClient_CreateCertificateTemplate() {
 
 	req := &privatecapb.CreateCertificateTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#CreateCertificateTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#CreateCertificateTemplateRequest.
 	}
 	op, err := c.CreateCertificateTemplate(ctx, req)
 	if err != nil {
@@ -765,7 +765,7 @@ func ExampleCertificateAuthorityClient_DeleteCertificateTemplate() {
 
 	req := &privatecapb.DeleteCertificateTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#DeleteCertificateTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#DeleteCertificateTemplateRequest.
 	}
 	op, err := c.DeleteCertificateTemplate(ctx, req)
 	if err != nil {
@@ -793,7 +793,7 @@ func ExampleCertificateAuthorityClient_GetCertificateTemplate() {
 
 	req := &privatecapb.GetCertificateTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#GetCertificateTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#GetCertificateTemplateRequest.
 	}
 	resp, err := c.GetCertificateTemplate(ctx, req)
 	if err != nil {
@@ -818,7 +818,7 @@ func ExampleCertificateAuthorityClient_ListCertificateTemplates() {
 
 	req := &privatecapb.ListCertificateTemplatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#ListCertificateTemplatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#ListCertificateTemplatesRequest.
 	}
 	it := c.ListCertificateTemplates(ctx, req)
 	for {
@@ -849,7 +849,7 @@ func ExampleCertificateAuthorityClient_UpdateCertificateTemplate() {
 
 	req := &privatecapb.UpdateCertificateTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#UpdateCertificateTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#UpdateCertificateTemplateRequest.
 	}
 	op, err := c.UpdateCertificateTemplate(ctx, req)
 	if err != nil {
diff --git a/security/privateca/apiv1/doc.go b/security/privateca/apiv1/doc.go
index d72d1db5f3b..7151f2e1a47 100644
--- a/security/privateca/apiv1/doc.go
+++ b/security/privateca/apiv1/doc.go
@@ -60,7 +60,7 @@
 //
 //	req := &privatecapb.CreateCertificateRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/security/privateca/v1#CreateCertificateRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/security/privateca/apiv1/privatecapb#CreateCertificateRequest.
 //	}
 //	resp, err := c.CreateCertificate(ctx, req)
 //	if err != nil {
diff --git a/security/privateca/apiv1/privatecapb/resources.pb.go b/security/privateca/apiv1/privatecapb/resources.pb.go
index 1571ddb2c0a..e7d301a0325 100644
--- a/security/privateca/apiv1/privatecapb/resources.pb.go
+++ b/security/privateca/apiv1/privatecapb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/security/privateca/v1/resources.proto
 
 package privatecapb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	expr "google.golang.org/genproto/googleapis/type/expr"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -733,7 +733,7 @@ type CertificateAuthority struct {
 	// Required. Immutable. The desired lifetime of the CA certificate. Used to create the
 	// "not_before_time" and "not_after_time" fields inside an X.509
 	// certificate.
-	Lifetime *duration.Duration `protobuf:"bytes,4,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
+	Lifetime *durationpb.Duration `protobuf:"bytes,4,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
 	// Required. Immutable. Used when issuing certificates for this [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority]. If this
 	// [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] is a self-signed CertificateAuthority, this key
 	// is also used to sign the self-signed CA certificate. Otherwise, it
@@ -767,15 +767,15 @@ type CertificateAuthority struct {
 	// and CRLs.
 	AccessUrls *CertificateAuthority_AccessUrls `protobuf:"bytes,12,opt,name=access_urls,json=accessUrls,proto3" json:"access_urls,omitempty"`
 	// Output only. The time at which this [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The time at which this [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] was soft deleted, if
 	// it is in the [DELETED][google.cloud.security.privateca.v1.CertificateAuthority.State.DELETED] state.
-	DeleteTime *timestamp.Timestamp `protobuf:"bytes,15,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
+	DeleteTime *timestamppb.Timestamp `protobuf:"bytes,15,opt,name=delete_time,json=deleteTime,proto3" json:"delete_time,omitempty"`
 	// Output only. The time at which this [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] will be permanently purged,
 	// if it is in the [DELETED][google.cloud.security.privateca.v1.CertificateAuthority.State.DELETED] state.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,16,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 	// Optional. Labels with user-defined metadata.
 	Labels map[string]string `protobuf:"bytes,17,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
@@ -833,7 +833,7 @@ func (x *CertificateAuthority) GetConfig() *CertificateConfig {
 	return nil
 }
 
-func (x *CertificateAuthority) GetLifetime() *duration.Duration {
+func (x *CertificateAuthority) GetLifetime() *durationpb.Duration {
 	if x != nil {
 		return x.Lifetime
 	}
@@ -896,28 +896,28 @@ func (x *CertificateAuthority) GetAccessUrls() *CertificateAuthority_AccessUrls
 	return nil
 }
 
-func (x *CertificateAuthority) GetCreateTime() *timestamp.Timestamp {
+func (x *CertificateAuthority) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CertificateAuthority) GetUpdateTime() *timestamp.Timestamp {
+func (x *CertificateAuthority) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *CertificateAuthority) GetDeleteTime() *timestamp.Timestamp {
+func (x *CertificateAuthority) GetDeleteTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeleteTime
 	}
 	return nil
 }
 
-func (x *CertificateAuthority) GetExpireTime() *timestamp.Timestamp {
+func (x *CertificateAuthority) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -1049,9 +1049,9 @@ type CertificateRevocationList struct {
 	// Output only. The [State][google.cloud.security.privateca.v1.CertificateRevocationList.State] for this [CertificateRevocationList][google.cloud.security.privateca.v1.CertificateRevocationList].
 	State CertificateRevocationList_State `protobuf:"varint,6,opt,name=state,proto3,enum=google.cloud.security.privateca.v1.CertificateRevocationList_State" json:"state,omitempty"`
 	// Output only. The time at which this [CertificateRevocationList][google.cloud.security.privateca.v1.CertificateRevocationList] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this [CertificateRevocationList][google.cloud.security.privateca.v1.CertificateRevocationList] was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The revision ID of this [CertificateRevocationList][google.cloud.security.privateca.v1.CertificateRevocationList]. A new revision is
 	// committed whenever a new CRL is published. The format is an 8-character
 	// hexadecimal string.
@@ -1134,14 +1134,14 @@ func (x *CertificateRevocationList) GetState() CertificateRevocationList_State {
 	return CertificateRevocationList_STATE_UNSPECIFIED
 }
 
-func (x *CertificateRevocationList) GetCreateTime() *timestamp.Timestamp {
+func (x *CertificateRevocationList) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CertificateRevocationList) GetUpdateTime() *timestamp.Timestamp {
+func (x *CertificateRevocationList) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1186,7 +1186,7 @@ type Certificate struct {
 	// "not_before_time" and "not_after_time" fields inside an X.509
 	// certificate. Note that the lifetime may be truncated if it would extend
 	// past the life of any certificate authority in the issuing chain.
-	Lifetime *duration.Duration `protobuf:"bytes,5,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
+	Lifetime *durationpb.Duration `protobuf:"bytes,5,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
 	// Immutable. The resource name for a [CertificateTemplate][google.cloud.security.privateca.v1.CertificateTemplate] used to issue this
 	// certificate, in the format
 	// `projects/*/locations/*/certificateTemplates/*`.
@@ -1208,9 +1208,9 @@ type Certificate struct {
 	// in issuer-to-root order according to RFC 5246.
 	PemCertificateChain []string `protobuf:"bytes,11,rep,name=pem_certificate_chain,json=pemCertificateChain,proto3" json:"pem_certificate_chain,omitempty"`
 	// Output only. The time at which this [Certificate][google.cloud.security.privateca.v1.Certificate] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this [Certificate][google.cloud.security.privateca.v1.Certificate] was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,13,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Labels with user-defined metadata.
 	Labels map[string]string `protobuf:"bytes,14,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
@@ -1282,7 +1282,7 @@ func (x *Certificate) GetIssuerCertificateAuthority() string {
 	return ""
 }
 
-func (x *Certificate) GetLifetime() *duration.Duration {
+func (x *Certificate) GetLifetime() *durationpb.Duration {
 	if x != nil {
 		return x.Lifetime
 	}
@@ -1331,14 +1331,14 @@ func (x *Certificate) GetPemCertificateChain() []string {
 	return nil
 }
 
-func (x *Certificate) GetCreateTime() *timestamp.Timestamp {
+func (x *Certificate) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Certificate) GetUpdateTime() *timestamp.Timestamp {
+func (x *Certificate) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1407,9 +1407,9 @@ type CertificateTemplate struct {
 	// Optional. A human-readable description of scenarios this template is intended for.
 	Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The time at which this [CertificateTemplate][google.cloud.security.privateca.v1.CertificateTemplate] was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time at which this [CertificateTemplate][google.cloud.security.privateca.v1.CertificateTemplate] was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Optional. Labels with user-defined metadata.
 	Labels map[string]string `protobuf:"bytes,8,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
@@ -1481,14 +1481,14 @@ func (x *CertificateTemplate) GetDescription() string {
 	return ""
 }
 
-func (x *CertificateTemplate) GetCreateTime() *timestamp.Timestamp {
+func (x *CertificateTemplate) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CertificateTemplate) GetUpdateTime() *timestamp.Timestamp {
+func (x *CertificateTemplate) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2698,7 +2698,7 @@ type CaPool_IssuancePolicy struct {
 	// that if the issuing [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] expires before a
 	// [Certificate][google.cloud.security.privateca.v1.Certificate]'s requested maximum_lifetime, the effective lifetime will
 	// be explicitly truncated to match it.
-	MaximumLifetime *duration.Duration `protobuf:"bytes,2,opt,name=maximum_lifetime,json=maximumLifetime,proto3" json:"maximum_lifetime,omitempty"`
+	MaximumLifetime *durationpb.Duration `protobuf:"bytes,2,opt,name=maximum_lifetime,json=maximumLifetime,proto3" json:"maximum_lifetime,omitempty"`
 	// Optional. If specified, then only methods allowed in the [IssuanceModes][google.cloud.security.privateca.v1.CaPool.IssuancePolicy.IssuanceModes] may be
 	// used to issue [Certificates][google.cloud.security.privateca.v1.Certificate].
 	AllowedIssuanceModes *CaPool_IssuancePolicy_IssuanceModes `protobuf:"bytes,3,opt,name=allowed_issuance_modes,json=allowedIssuanceModes,proto3" json:"allowed_issuance_modes,omitempty"`
@@ -2767,7 +2767,7 @@ func (x *CaPool_IssuancePolicy) GetAllowedKeyTypes() []*CaPool_IssuancePolicy_Al
 	return nil
 }
 
-func (x *CaPool_IssuancePolicy) GetMaximumLifetime() *duration.Duration {
+func (x *CaPool_IssuancePolicy) GetMaximumLifetime() *durationpb.Duration {
 	if x != nil {
 		return x.MaximumLifetime
 	}
@@ -3144,7 +3144,7 @@ type Certificate_RevocationDetails struct {
 	// Indicates why a [Certificate][google.cloud.security.privateca.v1.Certificate] was revoked.
 	RevocationState RevocationReason `protobuf:"varint,1,opt,name=revocation_state,json=revocationState,proto3,enum=google.cloud.security.privateca.v1.RevocationReason" json:"revocation_state,omitempty"`
 	// The time at which this [Certificate][google.cloud.security.privateca.v1.Certificate] was revoked.
-	RevocationTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=revocation_time,json=revocationTime,proto3" json:"revocation_time,omitempty"`
+	RevocationTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=revocation_time,json=revocationTime,proto3" json:"revocation_time,omitempty"`
 }
 
 func (x *Certificate_RevocationDetails) Reset() {
@@ -3186,7 +3186,7 @@ func (x *Certificate_RevocationDetails) GetRevocationState() RevocationReason {
 	return RevocationReason_REVOCATION_REASON_UNSPECIFIED
 }
 
-func (x *Certificate_RevocationDetails) GetRevocationTime() *timestamp.Timestamp {
+func (x *Certificate_RevocationDetails) GetRevocationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RevocationTime
 	}
@@ -3382,14 +3382,14 @@ type CertificateDescription_SubjectDescription struct {
 	// The serial number encoded in lowercase hexadecimal.
 	HexSerialNumber string `protobuf:"bytes,3,opt,name=hex_serial_number,json=hexSerialNumber,proto3" json:"hex_serial_number,omitempty"`
 	// For convenience, the actual lifetime of an issued certificate.
-	Lifetime *duration.Duration `protobuf:"bytes,4,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
+	Lifetime *durationpb.Duration `protobuf:"bytes,4,opt,name=lifetime,proto3" json:"lifetime,omitempty"`
 	// The time at which the certificate becomes valid.
-	NotBeforeTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=not_before_time,json=notBeforeTime,proto3" json:"not_before_time,omitempty"`
+	NotBeforeTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=not_before_time,json=notBeforeTime,proto3" json:"not_before_time,omitempty"`
 	// The time after which the certificate is expired.
 	// Per RFC 5280, the validity period for a certificate is the period of time
 	// from not_before_time through not_after_time, inclusive.
 	// Corresponds to 'not_before_time' + 'lifetime' - 1 second.
-	NotAfterTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=not_after_time,json=notAfterTime,proto3" json:"not_after_time,omitempty"`
+	NotAfterTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=not_after_time,json=notAfterTime,proto3" json:"not_after_time,omitempty"`
 }
 
 func (x *CertificateDescription_SubjectDescription) Reset() {
@@ -3445,21 +3445,21 @@ func (x *CertificateDescription_SubjectDescription) GetHexSerialNumber() string
 	return ""
 }
 
-func (x *CertificateDescription_SubjectDescription) GetLifetime() *duration.Duration {
+func (x *CertificateDescription_SubjectDescription) GetLifetime() *durationpb.Duration {
 	if x != nil {
 		return x.Lifetime
 	}
 	return nil
 }
 
-func (x *CertificateDescription_SubjectDescription) GetNotBeforeTime() *timestamp.Timestamp {
+func (x *CertificateDescription_SubjectDescription) GetNotBeforeTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NotBeforeTime
 	}
 	return nil
 }
 
-func (x *CertificateDescription_SubjectDescription) GetNotAfterTime() *timestamp.Timestamp {
+func (x *CertificateDescription_SubjectDescription) GetNotAfterTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NotAfterTime
 	}
@@ -4769,8 +4769,8 @@ var file_google_cloud_security_privateca_v1_resources_proto_goTypes = []interfac
 	(*CertificateDescription_CertificateFingerprint)(nil), // 47: google.cloud.security.privateca.v1.CertificateDescription.CertificateFingerprint
 	(*KeyUsage_KeyUsageOptions)(nil),                      // 48: google.cloud.security.privateca.v1.KeyUsage.KeyUsageOptions
 	(*KeyUsage_ExtendedKeyUsageOptions)(nil),              // 49: google.cloud.security.privateca.v1.KeyUsage.ExtendedKeyUsageOptions
-	(*duration.Duration)(nil),                             // 50: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),                           // 51: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),                           // 50: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                         // 51: google.protobuf.Timestamp
 	(*expr.Expr)(nil),                                     // 52: google.type.Expr
 }
 var file_google_cloud_security_privateca_v1_resources_proto_depIdxs = []int32{
diff --git a/security/privateca/apiv1/privatecapb/service.pb.go b/security/privateca/apiv1/privatecapb/service.pb.go
index 68fbed22bc2..2aa91a3553c 100644
--- a/security/privateca/apiv1/privatecapb/service.pb.go
+++ b/security/privateca/apiv1/privatecapb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/security/privateca/v1/service.proto
 
 package privatecapb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -472,7 +472,7 @@ type UpdateCertificateRequest struct {
 	// Required. [Certificate][google.cloud.security.privateca.v1.Certificate] with updated values.
 	Certificate *Certificate `protobuf:"bytes,1,opt,name=certificate,proto3" json:"certificate,omitempty"`
 	// Required. A list of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. An ID to identify requests. Specify a unique request ID so that if you must
 	// retry your request, the server will know to ignore the request if it has
 	// already been completed. The server will guarantee that for at least 60
@@ -528,7 +528,7 @@ func (x *UpdateCertificateRequest) GetCertificate() *Certificate {
 	return nil
 }
 
-func (x *UpdateCertificateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCertificateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1360,7 +1360,7 @@ type UpdateCertificateAuthorityRequest struct {
 	// Required. [CertificateAuthority][google.cloud.security.privateca.v1.CertificateAuthority] with updated values.
 	CertificateAuthority *CertificateAuthority `protobuf:"bytes,1,opt,name=certificate_authority,json=certificateAuthority,proto3" json:"certificate_authority,omitempty"`
 	// Required. A list of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. An ID to identify requests. Specify a unique request ID so that if you must
 	// retry your request, the server will know to ignore the request if it has
 	// already been completed. The server will guarantee that for at least 60
@@ -1416,7 +1416,7 @@ func (x *UpdateCertificateAuthorityRequest) GetCertificateAuthority() *Certifica
 	return nil
 }
 
-func (x *UpdateCertificateAuthorityRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCertificateAuthorityRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1531,7 +1531,7 @@ type UpdateCaPoolRequest struct {
 	// Required. [CaPool][google.cloud.security.privateca.v1.CaPool] with updated values.
 	CaPool *CaPool `protobuf:"bytes,1,opt,name=ca_pool,json=caPool,proto3" json:"ca_pool,omitempty"`
 	// Required. A list of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. An ID to identify requests. Specify a unique request ID so that if you must
 	// retry your request, the server will know to ignore the request if it has
 	// already been completed. The server will guarantee that for at least 60
@@ -1587,7 +1587,7 @@ func (x *UpdateCaPoolRequest) GetCaPool() *CaPool {
 	return nil
 }
 
-func (x *UpdateCaPoolRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCaPoolRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2235,7 +2235,7 @@ type UpdateCertificateRevocationListRequest struct {
 	// Required. [CertificateRevocationList][google.cloud.security.privateca.v1.CertificateRevocationList] with updated values.
 	CertificateRevocationList *CertificateRevocationList `protobuf:"bytes,1,opt,name=certificate_revocation_list,json=certificateRevocationList,proto3" json:"certificate_revocation_list,omitempty"`
 	// Required. A list of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. An ID to identify requests. Specify a unique request ID so that if you must
 	// retry your request, the server will know to ignore the request if it has
 	// already been completed. The server will guarantee that for at least 60
@@ -2291,7 +2291,7 @@ func (x *UpdateCertificateRevocationListRequest) GetCertificateRevocationList()
 	return nil
 }
 
-func (x *UpdateCertificateRevocationListRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCertificateRevocationListRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2694,7 +2694,7 @@ type UpdateCertificateTemplateRequest struct {
 	// Required. [CertificateTemplate][google.cloud.security.privateca.v1.CertificateTemplate] with updated values.
 	CertificateTemplate *CertificateTemplate `protobuf:"bytes,1,opt,name=certificate_template,json=certificateTemplate,proto3" json:"certificate_template,omitempty"`
 	// Required. A list of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Optional. An ID to identify requests. Specify a unique request ID so that if you must
 	// retry your request, the server will know to ignore the request if it has
 	// already been completed. The server will guarantee that for at least 60
@@ -2750,7 +2750,7 @@ func (x *UpdateCertificateTemplateRequest) GetCertificateTemplate() *Certificate
 	return nil
 }
 
-func (x *UpdateCertificateTemplateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCertificateTemplateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2771,9 +2771,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -2821,14 +2821,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_security_privateca_v1_service_proto_rawDescGZIP(), []int{36}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -3965,13 +3965,13 @@ var file_google_cloud_security_privateca_v1_service_proto_goTypes = []interface{
 	(*FetchCaCertsResponse_CertChain)(nil),         // 37: google.cloud.security.privateca.v1.FetchCaCertsResponse.CertChain
 	(*Certificate)(nil),                            // 38: google.cloud.security.privateca.v1.Certificate
 	(RevocationReason)(0),                          // 39: google.cloud.security.privateca.v1.RevocationReason
-	(*field_mask.FieldMask)(nil),                   // 40: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                  // 40: google.protobuf.FieldMask
 	(*SubordinateConfig)(nil),                      // 41: google.cloud.security.privateca.v1.SubordinateConfig
 	(*CertificateAuthority)(nil),                   // 42: google.cloud.security.privateca.v1.CertificateAuthority
 	(*CaPool)(nil),                                 // 43: google.cloud.security.privateca.v1.CaPool
 	(*CertificateRevocationList)(nil),              // 44: google.cloud.security.privateca.v1.CertificateRevocationList
 	(*CertificateTemplate)(nil),                    // 45: google.cloud.security.privateca.v1.CertificateTemplate
-	(*timestamp.Timestamp)(nil),                    // 46: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                  // 46: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),                  // 47: google.longrunning.Operation
 }
 var file_google_cloud_security_privateca_v1_service_proto_depIdxs = []int32{
diff --git a/securitycenter/apiv1/doc.go b/securitycenter/apiv1/doc.go
index b50cf53437c..c5df6f7d228 100644
--- a/securitycenter/apiv1/doc.go
+++ b/securitycenter/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &securitycenterpb.BulkMuteFindingsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#BulkMuteFindingsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#BulkMuteFindingsRequest.
 //	}
 //	op, err := c.BulkMuteFindings(ctx, req)
 //	if err != nil {
diff --git a/securitycenter/apiv1/security_center_client.go b/securitycenter/apiv1/security_center_client.go
index 23f19444bb5..fac7e43c46f 100644
--- a/securitycenter/apiv1/security_center_client.go
+++ b/securitycenter/apiv1/security_center_client.go
@@ -25,19 +25,19 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
-	emptypb "github.com/golang/protobuf/ptypes/empty"
+	securitycenterpb "cloud.google.com/go/securitycenter/apiv1/securitycenterpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	securitycenterpb "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 var newClientHook clientHook
diff --git a/securitycenter/apiv1/security_center_client_example_test.go b/securitycenter/apiv1/security_center_client_example_test.go
index b28d6827b15..78d174cb3bb 100644
--- a/securitycenter/apiv1/security_center_client_example_test.go
+++ b/securitycenter/apiv1/security_center_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	securitycenter "cloud.google.com/go/securitycenter/apiv1"
+	securitycenterpb "cloud.google.com/go/securitycenter/apiv1/securitycenterpb"
 	"google.golang.org/api/iterator"
-	securitycenterpb "google.golang.org/genproto/googleapis/cloud/securitycenter/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
@@ -58,7 +58,7 @@ func ExampleClient_BulkMuteFindings() {
 
 	req := &securitycenterpb.BulkMuteFindingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#BulkMuteFindingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#BulkMuteFindingsRequest.
 	}
 	op, err := c.BulkMuteFindings(ctx, req)
 	if err != nil {
@@ -88,7 +88,7 @@ func ExampleClient_CreateSource() {
 
 	req := &securitycenterpb.CreateSourceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#CreateSourceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#CreateSourceRequest.
 	}
 	resp, err := c.CreateSource(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleClient_CreateFinding() {
 
 	req := &securitycenterpb.CreateFindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#CreateFindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#CreateFindingRequest.
 	}
 	resp, err := c.CreateFinding(ctx, req)
 	if err != nil {
@@ -138,7 +138,7 @@ func ExampleClient_CreateMuteConfig() {
 
 	req := &securitycenterpb.CreateMuteConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#CreateMuteConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#CreateMuteConfigRequest.
 	}
 	resp, err := c.CreateMuteConfig(ctx, req)
 	if err != nil {
@@ -163,7 +163,7 @@ func ExampleClient_CreateNotificationConfig() {
 
 	req := &securitycenterpb.CreateNotificationConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#CreateNotificationConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#CreateNotificationConfigRequest.
 	}
 	resp, err := c.CreateNotificationConfig(ctx, req)
 	if err != nil {
@@ -188,7 +188,7 @@ func ExampleClient_DeleteMuteConfig() {
 
 	req := &securitycenterpb.DeleteMuteConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#DeleteMuteConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#DeleteMuteConfigRequest.
 	}
 	err = c.DeleteMuteConfig(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExampleClient_DeleteNotificationConfig() {
 
 	req := &securitycenterpb.DeleteNotificationConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#DeleteNotificationConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#DeleteNotificationConfigRequest.
 	}
 	err = c.DeleteNotificationConfig(ctx, req)
 	if err != nil {
@@ -234,7 +234,7 @@ func ExampleClient_GetBigQueryExport() {
 
 	req := &securitycenterpb.GetBigQueryExportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#GetBigQueryExportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#GetBigQueryExportRequest.
 	}
 	resp, err := c.GetBigQueryExport(ctx, req)
 	if err != nil {
@@ -284,7 +284,7 @@ func ExampleClient_GetMuteConfig() {
 
 	req := &securitycenterpb.GetMuteConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#GetMuteConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#GetMuteConfigRequest.
 	}
 	resp, err := c.GetMuteConfig(ctx, req)
 	if err != nil {
@@ -309,7 +309,7 @@ func ExampleClient_GetNotificationConfig() {
 
 	req := &securitycenterpb.GetNotificationConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#GetNotificationConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#GetNotificationConfigRequest.
 	}
 	resp, err := c.GetNotificationConfig(ctx, req)
 	if err != nil {
@@ -334,7 +334,7 @@ func ExampleClient_GetOrganizationSettings() {
 
 	req := &securitycenterpb.GetOrganizationSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#GetOrganizationSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#GetOrganizationSettingsRequest.
 	}
 	resp, err := c.GetOrganizationSettings(ctx, req)
 	if err != nil {
@@ -359,7 +359,7 @@ func ExampleClient_GetSource() {
 
 	req := &securitycenterpb.GetSourceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#GetSourceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#GetSourceRequest.
 	}
 	resp, err := c.GetSource(ctx, req)
 	if err != nil {
@@ -384,7 +384,7 @@ func ExampleClient_GroupAssets() {
 
 	req := &securitycenterpb.GroupAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#GroupAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#GroupAssetsRequest.
 	}
 	it := c.GroupAssets(ctx, req)
 	for {
@@ -415,7 +415,7 @@ func ExampleClient_GroupFindings() {
 
 	req := &securitycenterpb.GroupFindingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#GroupFindingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#GroupFindingsRequest.
 	}
 	it := c.GroupFindings(ctx, req)
 	for {
@@ -446,7 +446,7 @@ func ExampleClient_ListAssets() {
 
 	req := &securitycenterpb.ListAssetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#ListAssetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#ListAssetsRequest.
 	}
 	it := c.ListAssets(ctx, req)
 	for {
@@ -477,7 +477,7 @@ func ExampleClient_ListFindings() {
 
 	req := &securitycenterpb.ListFindingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#ListFindingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#ListFindingsRequest.
 	}
 	it := c.ListFindings(ctx, req)
 	for {
@@ -508,7 +508,7 @@ func ExampleClient_ListMuteConfigs() {
 
 	req := &securitycenterpb.ListMuteConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#ListMuteConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#ListMuteConfigsRequest.
 	}
 	it := c.ListMuteConfigs(ctx, req)
 	for {
@@ -539,7 +539,7 @@ func ExampleClient_ListNotificationConfigs() {
 
 	req := &securitycenterpb.ListNotificationConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#ListNotificationConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#ListNotificationConfigsRequest.
 	}
 	it := c.ListNotificationConfigs(ctx, req)
 	for {
@@ -570,7 +570,7 @@ func ExampleClient_ListSources() {
 
 	req := &securitycenterpb.ListSourcesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#ListSourcesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#ListSourcesRequest.
 	}
 	it := c.ListSources(ctx, req)
 	for {
@@ -601,7 +601,7 @@ func ExampleClient_RunAssetDiscovery() {
 
 	req := &securitycenterpb.RunAssetDiscoveryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#RunAssetDiscoveryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#RunAssetDiscoveryRequest.
 	}
 	op, err := c.RunAssetDiscovery(ctx, req)
 	if err != nil {
@@ -631,7 +631,7 @@ func ExampleClient_SetFindingState() {
 
 	req := &securitycenterpb.SetFindingStateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#SetFindingStateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#SetFindingStateRequest.
 	}
 	resp, err := c.SetFindingState(ctx, req)
 	if err != nil {
@@ -656,7 +656,7 @@ func ExampleClient_SetMute() {
 
 	req := &securitycenterpb.SetMuteRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#SetMuteRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#SetMuteRequest.
 	}
 	resp, err := c.SetMute(ctx, req)
 	if err != nil {
@@ -731,7 +731,7 @@ func ExampleClient_UpdateExternalSystem() {
 
 	req := &securitycenterpb.UpdateExternalSystemRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#UpdateExternalSystemRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#UpdateExternalSystemRequest.
 	}
 	resp, err := c.UpdateExternalSystem(ctx, req)
 	if err != nil {
@@ -756,7 +756,7 @@ func ExampleClient_UpdateFinding() {
 
 	req := &securitycenterpb.UpdateFindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#UpdateFindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#UpdateFindingRequest.
 	}
 	resp, err := c.UpdateFinding(ctx, req)
 	if err != nil {
@@ -781,7 +781,7 @@ func ExampleClient_UpdateMuteConfig() {
 
 	req := &securitycenterpb.UpdateMuteConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#UpdateMuteConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#UpdateMuteConfigRequest.
 	}
 	resp, err := c.UpdateMuteConfig(ctx, req)
 	if err != nil {
@@ -806,7 +806,7 @@ func ExampleClient_UpdateNotificationConfig() {
 
 	req := &securitycenterpb.UpdateNotificationConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#UpdateNotificationConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#UpdateNotificationConfigRequest.
 	}
 	resp, err := c.UpdateNotificationConfig(ctx, req)
 	if err != nil {
@@ -831,7 +831,7 @@ func ExampleClient_UpdateOrganizationSettings() {
 
 	req := &securitycenterpb.UpdateOrganizationSettingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#UpdateOrganizationSettingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#UpdateOrganizationSettingsRequest.
 	}
 	resp, err := c.UpdateOrganizationSettings(ctx, req)
 	if err != nil {
@@ -856,7 +856,7 @@ func ExampleClient_UpdateSource() {
 
 	req := &securitycenterpb.UpdateSourceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#UpdateSourceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#UpdateSourceRequest.
 	}
 	resp, err := c.UpdateSource(ctx, req)
 	if err != nil {
@@ -881,7 +881,7 @@ func ExampleClient_UpdateSecurityMarks() {
 
 	req := &securitycenterpb.UpdateSecurityMarksRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#UpdateSecurityMarksRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#UpdateSecurityMarksRequest.
 	}
 	resp, err := c.UpdateSecurityMarks(ctx, req)
 	if err != nil {
@@ -906,7 +906,7 @@ func ExampleClient_CreateBigQueryExport() {
 
 	req := &securitycenterpb.CreateBigQueryExportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#CreateBigQueryExportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#CreateBigQueryExportRequest.
 	}
 	resp, err := c.CreateBigQueryExport(ctx, req)
 	if err != nil {
@@ -931,7 +931,7 @@ func ExampleClient_DeleteBigQueryExport() {
 
 	req := &securitycenterpb.DeleteBigQueryExportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#DeleteBigQueryExportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#DeleteBigQueryExportRequest.
 	}
 	err = c.DeleteBigQueryExport(ctx, req)
 	if err != nil {
@@ -954,7 +954,7 @@ func ExampleClient_UpdateBigQueryExport() {
 
 	req := &securitycenterpb.UpdateBigQueryExportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#UpdateBigQueryExportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#UpdateBigQueryExportRequest.
 	}
 	resp, err := c.UpdateBigQueryExport(ctx, req)
 	if err != nil {
@@ -979,7 +979,7 @@ func ExampleClient_ListBigQueryExports() {
 
 	req := &securitycenterpb.ListBigQueryExportsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/securitycenter/v1#ListBigQueryExportsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/securitycenter/apiv1/securitycenterpb#ListBigQueryExportsRequest.
 	}
 	it := c.ListBigQueryExports(ctx, req)
 	for {
diff --git a/securitycenter/apiv1/securitycenterpb/access.pb.go b/securitycenter/apiv1/securitycenterpb/access.pb.go
index 680d43d98b4..3761f4823c3 100644
--- a/securitycenter/apiv1/securitycenterpb/access.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/access.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/access.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/asset.pb.go b/securitycenter/apiv1/securitycenterpb/asset.pb.go
index 641d7a3ae33..578005046bf 100644
--- a/securitycenter/apiv1/securitycenterpb/asset.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/asset.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/asset.proto
 
 package securitycenterpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -60,14 +60,14 @@ type Asset struct {
 	SecurityCenterProperties *Asset_SecurityCenterProperties `protobuf:"bytes,2,opt,name=security_center_properties,json=securityCenterProperties,proto3" json:"security_center_properties,omitempty"`
 	// Resource managed properties. These properties are managed and defined by
 	// the Google Cloud resource and cannot be modified by the user.
-	ResourceProperties map[string]*_struct.Value `protobuf:"bytes,7,rep,name=resource_properties,json=resourceProperties,proto3" json:"resource_properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ResourceProperties map[string]*structpb.Value `protobuf:"bytes,7,rep,name=resource_properties,json=resourceProperties,proto3" json:"resource_properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// User specified security marks. These marks are entirely managed by the user
 	// and come from the SecurityMarks resource that belongs to the asset.
 	SecurityMarks *SecurityMarks `protobuf:"bytes,8,opt,name=security_marks,json=securityMarks,proto3" json:"security_marks,omitempty"`
 	// The time at which the asset was created in Security Command Center.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time at which the asset was last updated or added in Cloud SCC.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Cloud IAM Policy information associated with the Google Cloud resource
 	// described by the Security Command Center asset. This information is managed
 	// and defined by the Google Cloud resource and cannot be modified by the
@@ -127,7 +127,7 @@ func (x *Asset) GetSecurityCenterProperties() *Asset_SecurityCenterProperties {
 	return nil
 }
 
-func (x *Asset) GetResourceProperties() map[string]*_struct.Value {
+func (x *Asset) GetResourceProperties() map[string]*structpb.Value {
 	if x != nil {
 		return x.ResourceProperties
 	}
@@ -141,14 +141,14 @@ func (x *Asset) GetSecurityMarks() *SecurityMarks {
 	return nil
 }
 
-func (x *Asset) GetCreateTime() *timestamp.Timestamp {
+func (x *Asset) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Asset) GetUpdateTime() *timestamp.Timestamp {
+func (x *Asset) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -495,9 +495,9 @@ var file_google_cloud_securitycenter_v1_asset_proto_goTypes = []interface{}{
 	(*Asset_IamPolicy)(nil),                // 2: google.cloud.securitycenter.v1.Asset.IamPolicy
 	nil,                                    // 3: google.cloud.securitycenter.v1.Asset.ResourcePropertiesEntry
 	(*SecurityMarks)(nil),                  // 4: google.cloud.securitycenter.v1.SecurityMarks
-	(*timestamp.Timestamp)(nil),            // 5: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 5: google.protobuf.Timestamp
 	(*Folder)(nil),                         // 6: google.cloud.securitycenter.v1.Folder
-	(*_struct.Value)(nil),                  // 7: google.protobuf.Value
+	(*structpb.Value)(nil),                 // 7: google.protobuf.Value
 }
 var file_google_cloud_securitycenter_v1_asset_proto_depIdxs = []int32{
 	1, // 0: google.cloud.securitycenter.v1.Asset.security_center_properties:type_name -> google.cloud.securitycenter.v1.Asset.SecurityCenterProperties
diff --git a/securitycenter/apiv1/securitycenterpb/bigquery_export.pb.go b/securitycenter/apiv1/securitycenterpb/bigquery_export.pb.go
index bbd7295d577..6f0abe21578 100644
--- a/securitycenter/apiv1/securitycenterpb/bigquery_export.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/bigquery_export.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/bigquery_export.proto
 
 package securitycenterpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -83,11 +83,11 @@ type BigQueryExport struct {
 	// Output only. The time at which the big query export was created.
 	// This field is set by the server and will be ignored if provided on export
 	// on creation.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The most recent time at which the big export was updated.
 	// This field is set by the server and will be ignored if provided on export
 	// creation or update.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Email address of the user who last edited the big query export.
 	// This field is set by the server and will be ignored if provided on export
 	// creation or update.
@@ -157,14 +157,14 @@ func (x *BigQueryExport) GetDataset() string {
 	return ""
 }
 
-func (x *BigQueryExport) GetCreateTime() *timestamp.Timestamp {
+func (x *BigQueryExport) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *BigQueryExport) GetUpdateTime() *timestamp.Timestamp {
+func (x *BigQueryExport) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -265,8 +265,8 @@ func file_google_cloud_securitycenter_v1_bigquery_export_proto_rawDescGZIP() []b
 
 var file_google_cloud_securitycenter_v1_bigquery_export_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_securitycenter_v1_bigquery_export_proto_goTypes = []interface{}{
-	(*BigQueryExport)(nil),      // 0: google.cloud.securitycenter.v1.BigQueryExport
-	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+	(*BigQueryExport)(nil),        // 0: google.cloud.securitycenter.v1.BigQueryExport
+	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 }
 var file_google_cloud_securitycenter_v1_bigquery_export_proto_depIdxs = []int32{
 	1, // 0: google.cloud.securitycenter.v1.BigQueryExport.create_time:type_name -> google.protobuf.Timestamp
diff --git a/securitycenter/apiv1/securitycenterpb/compliance.pb.go b/securitycenter/apiv1/securitycenterpb/compliance.pb.go
index 2c4e1fc2c52..155379e6542 100644
--- a/securitycenter/apiv1/securitycenterpb/compliance.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/compliance.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/compliance.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/connection.pb.go b/securitycenter/apiv1/securitycenterpb/connection.pb.go
index b48f82a28ee..089fe27af45 100644
--- a/securitycenter/apiv1/securitycenterpb/connection.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/connection.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/connection.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/contact_details.pb.go b/securitycenter/apiv1/securitycenterpb/contact_details.pb.go
index f6bfa2dfc32..6cf9740c8c9 100644
--- a/securitycenter/apiv1/securitycenterpb/contact_details.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/contact_details.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/contact_details.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/container.pb.go b/securitycenter/apiv1/securitycenterpb/container.pb.go
index 36e64f9c5e5..357518a5f44 100644
--- a/securitycenter/apiv1/securitycenterpb/container.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/container.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/container.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/database.pb.go b/securitycenter/apiv1/securitycenterpb/database.pb.go
index e69e822f1dd..f640e0c764f 100644
--- a/securitycenter/apiv1/securitycenterpb/database.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/database.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/database.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/exfiltration.pb.go b/securitycenter/apiv1/securitycenterpb/exfiltration.pb.go
index f246c10f18a..5f55250735b 100644
--- a/securitycenter/apiv1/securitycenterpb/exfiltration.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/exfiltration.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/exfiltration.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/external_system.pb.go b/securitycenter/apiv1/securitycenterpb/external_system.pb.go
index 1f2b1fe187c..aee1d95b19d 100644
--- a/securitycenter/apiv1/securitycenterpb/external_system.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/external_system.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/external_system.proto
 
 package securitycenterpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -60,7 +60,7 @@ type ExternalSystem struct {
 	Status string `protobuf:"bytes,4,opt,name=status,proto3" json:"status,omitempty"`
 	// The most recent time when the corresponding finding's ticket/tracker was
 	// updated in the external system.
-	ExternalSystemUpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=external_system_update_time,json=externalSystemUpdateTime,proto3" json:"external_system_update_time,omitempty"`
+	ExternalSystemUpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=external_system_update_time,json=externalSystemUpdateTime,proto3" json:"external_system_update_time,omitempty"`
 }
 
 func (x *ExternalSystem) Reset() {
@@ -123,7 +123,7 @@ func (x *ExternalSystem) GetStatus() string {
 	return ""
 }
 
-func (x *ExternalSystem) GetExternalSystemUpdateTime() *timestamp.Timestamp {
+func (x *ExternalSystem) GetExternalSystemUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExternalSystemUpdateTime
 	}
@@ -208,8 +208,8 @@ func file_google_cloud_securitycenter_v1_external_system_proto_rawDescGZIP() []b
 
 var file_google_cloud_securitycenter_v1_external_system_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_securitycenter_v1_external_system_proto_goTypes = []interface{}{
-	(*ExternalSystem)(nil),      // 0: google.cloud.securitycenter.v1.ExternalSystem
-	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+	(*ExternalSystem)(nil),        // 0: google.cloud.securitycenter.v1.ExternalSystem
+	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 }
 var file_google_cloud_securitycenter_v1_external_system_proto_depIdxs = []int32{
 	1, // 0: google.cloud.securitycenter.v1.ExternalSystem.external_system_update_time:type_name -> google.protobuf.Timestamp
diff --git a/securitycenter/apiv1/securitycenterpb/file.pb.go b/securitycenter/apiv1/securitycenterpb/file.pb.go
index e4c4c231fe8..ed2ab98aebd 100644
--- a/securitycenter/apiv1/securitycenterpb/file.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/file.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/file.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/finding.pb.go b/securitycenter/apiv1/securitycenterpb/finding.pb.go
index 7fcb2f745f4..4856b22eda7 100644
--- a/securitycenter/apiv1/securitycenterpb/finding.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/finding.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/finding.proto
 
 package securitycenterpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -362,7 +362,7 @@ type Finding struct {
 	// that writes the finding. The key names in the source_properties map must be
 	// between 1 and 255 characters, and must start with a letter and contain
 	// alphanumeric characters or underscores only.
-	SourceProperties map[string]*_struct.Value `protobuf:"bytes,7,rep,name=source_properties,json=sourceProperties,proto3" json:"source_properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	SourceProperties map[string]*structpb.Value `protobuf:"bytes,7,rep,name=source_properties,json=sourceProperties,proto3" json:"source_properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Output only. User specified security marks. These marks are entirely
 	// managed by the user and come from the SecurityMarks resource that belongs
 	// to the finding.
@@ -374,9 +374,9 @@ type Finding struct {
 	// accuracy is determined by the detector. If the finding is later resolved,
 	// then this time reflects when the finding was resolved. This must not
 	// be set to a value greater than the current timestamp.
-	EventTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
+	EventTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=event_time,json=eventTime,proto3" json:"event_time,omitempty"`
 	// The time at which the finding was created in Security Command Center.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The severity of the finding. This field is managed by the source that
 	// writes the finding.
 	Severity Finding_Severity `protobuf:"varint,12,opt,name=severity,proto3,enum=google.cloud.securitycenter.v1.Finding_Severity" json:"severity,omitempty"`
@@ -404,7 +404,7 @@ type Finding struct {
 	// (https://cve.mitre.org/about/)
 	Vulnerability *Vulnerability `protobuf:"bytes,20,opt,name=vulnerability,proto3" json:"vulnerability,omitempty"`
 	// Output only. The most recent time this finding was muted or unmuted.
-	MuteUpdateTime *timestamp.Timestamp `protobuf:"bytes,21,opt,name=mute_update_time,json=muteUpdateTime,proto3" json:"mute_update_time,omitempty"`
+	MuteUpdateTime *timestamppb.Timestamp `protobuf:"bytes,21,opt,name=mute_update_time,json=muteUpdateTime,proto3" json:"mute_update_time,omitempty"`
 	// Output only. Third party SIEM/SOAR fields within SCC, contains external system
 	// information and external system finding fields.
 	ExternalSystems map[string]*ExternalSystem `protobuf:"bytes,22,rep,name=external_systems,json=externalSystems,proto3" json:"external_systems,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -538,7 +538,7 @@ func (x *Finding) GetExternalUri() string {
 	return ""
 }
 
-func (x *Finding) GetSourceProperties() map[string]*_struct.Value {
+func (x *Finding) GetSourceProperties() map[string]*structpb.Value {
 	if x != nil {
 		return x.SourceProperties
 	}
@@ -552,14 +552,14 @@ func (x *Finding) GetSecurityMarks() *SecurityMarks {
 	return nil
 }
 
-func (x *Finding) GetEventTime() *timestamp.Timestamp {
+func (x *Finding) GetEventTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EventTime
 	}
 	return nil
 }
 
-func (x *Finding) GetCreateTime() *timestamp.Timestamp {
+func (x *Finding) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -608,7 +608,7 @@ func (x *Finding) GetVulnerability() *Vulnerability {
 	return nil
 }
 
-func (x *Finding) GetMuteUpdateTime() *timestamp.Timestamp {
+func (x *Finding) GetMuteUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.MuteUpdateTime
 	}
@@ -1011,31 +1011,31 @@ func file_google_cloud_securitycenter_v1_finding_proto_rawDescGZIP() []byte {
 var file_google_cloud_securitycenter_v1_finding_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
 var file_google_cloud_securitycenter_v1_finding_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_google_cloud_securitycenter_v1_finding_proto_goTypes = []interface{}{
-	(Finding_State)(0),          // 0: google.cloud.securitycenter.v1.Finding.State
-	(Finding_Severity)(0),       // 1: google.cloud.securitycenter.v1.Finding.Severity
-	(Finding_Mute)(0),           // 2: google.cloud.securitycenter.v1.Finding.Mute
-	(Finding_FindingClass)(0),   // 3: google.cloud.securitycenter.v1.Finding.FindingClass
-	(*Finding)(nil),             // 4: google.cloud.securitycenter.v1.Finding
-	nil,                         // 5: google.cloud.securitycenter.v1.Finding.SourcePropertiesEntry
-	nil,                         // 6: google.cloud.securitycenter.v1.Finding.ExternalSystemsEntry
-	nil,                         // 7: google.cloud.securitycenter.v1.Finding.ContactsEntry
-	(*SecurityMarks)(nil),       // 8: google.cloud.securitycenter.v1.SecurityMarks
-	(*timestamp.Timestamp)(nil), // 9: google.protobuf.Timestamp
-	(*Indicator)(nil),           // 10: google.cloud.securitycenter.v1.Indicator
-	(*Vulnerability)(nil),       // 11: google.cloud.securitycenter.v1.Vulnerability
-	(*MitreAttack)(nil),         // 12: google.cloud.securitycenter.v1.MitreAttack
-	(*Access)(nil),              // 13: google.cloud.securitycenter.v1.Access
-	(*Connection)(nil),          // 14: google.cloud.securitycenter.v1.Connection
-	(*Process)(nil),             // 15: google.cloud.securitycenter.v1.Process
-	(*Compliance)(nil),          // 16: google.cloud.securitycenter.v1.Compliance
-	(*Exfiltration)(nil),        // 17: google.cloud.securitycenter.v1.Exfiltration
-	(*IamBinding)(nil),          // 18: google.cloud.securitycenter.v1.IamBinding
-	(*Container)(nil),           // 19: google.cloud.securitycenter.v1.Container
-	(*Kubernetes)(nil),          // 20: google.cloud.securitycenter.v1.Kubernetes
-	(*Database)(nil),            // 21: google.cloud.securitycenter.v1.Database
-	(*_struct.Value)(nil),       // 22: google.protobuf.Value
-	(*ExternalSystem)(nil),      // 23: google.cloud.securitycenter.v1.ExternalSystem
-	(*ContactDetails)(nil),      // 24: google.cloud.securitycenter.v1.ContactDetails
+	(Finding_State)(0),            // 0: google.cloud.securitycenter.v1.Finding.State
+	(Finding_Severity)(0),         // 1: google.cloud.securitycenter.v1.Finding.Severity
+	(Finding_Mute)(0),             // 2: google.cloud.securitycenter.v1.Finding.Mute
+	(Finding_FindingClass)(0),     // 3: google.cloud.securitycenter.v1.Finding.FindingClass
+	(*Finding)(nil),               // 4: google.cloud.securitycenter.v1.Finding
+	nil,                           // 5: google.cloud.securitycenter.v1.Finding.SourcePropertiesEntry
+	nil,                           // 6: google.cloud.securitycenter.v1.Finding.ExternalSystemsEntry
+	nil,                           // 7: google.cloud.securitycenter.v1.Finding.ContactsEntry
+	(*SecurityMarks)(nil),         // 8: google.cloud.securitycenter.v1.SecurityMarks
+	(*timestamppb.Timestamp)(nil), // 9: google.protobuf.Timestamp
+	(*Indicator)(nil),             // 10: google.cloud.securitycenter.v1.Indicator
+	(*Vulnerability)(nil),         // 11: google.cloud.securitycenter.v1.Vulnerability
+	(*MitreAttack)(nil),           // 12: google.cloud.securitycenter.v1.MitreAttack
+	(*Access)(nil),                // 13: google.cloud.securitycenter.v1.Access
+	(*Connection)(nil),            // 14: google.cloud.securitycenter.v1.Connection
+	(*Process)(nil),               // 15: google.cloud.securitycenter.v1.Process
+	(*Compliance)(nil),            // 16: google.cloud.securitycenter.v1.Compliance
+	(*Exfiltration)(nil),          // 17: google.cloud.securitycenter.v1.Exfiltration
+	(*IamBinding)(nil),            // 18: google.cloud.securitycenter.v1.IamBinding
+	(*Container)(nil),             // 19: google.cloud.securitycenter.v1.Container
+	(*Kubernetes)(nil),            // 20: google.cloud.securitycenter.v1.Kubernetes
+	(*Database)(nil),              // 21: google.cloud.securitycenter.v1.Database
+	(*structpb.Value)(nil),        // 22: google.protobuf.Value
+	(*ExternalSystem)(nil),        // 23: google.cloud.securitycenter.v1.ExternalSystem
+	(*ContactDetails)(nil),        // 24: google.cloud.securitycenter.v1.ContactDetails
 }
 var file_google_cloud_securitycenter_v1_finding_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.securitycenter.v1.Finding.state:type_name -> google.cloud.securitycenter.v1.Finding.State
diff --git a/securitycenter/apiv1/securitycenterpb/folder.pb.go b/securitycenter/apiv1/securitycenterpb/folder.pb.go
index f839831c975..2417a374fa4 100644
--- a/securitycenter/apiv1/securitycenterpb/folder.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/folder.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/folder.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/iam_binding.pb.go b/securitycenter/apiv1/securitycenterpb/iam_binding.pb.go
index 53adbe1ffeb..44502ba5cb0 100644
--- a/securitycenter/apiv1/securitycenterpb/iam_binding.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/iam_binding.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/iam_binding.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/indicator.pb.go b/securitycenter/apiv1/securitycenterpb/indicator.pb.go
index 3c2a133fb1a..fec80b7e8e8 100644
--- a/securitycenter/apiv1/securitycenterpb/indicator.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/indicator.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/indicator.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/kubernetes.pb.go b/securitycenter/apiv1/securitycenterpb/kubernetes.pb.go
index a67bd897c6a..4615187e72f 100644
--- a/securitycenter/apiv1/securitycenterpb/kubernetes.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/kubernetes.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/kubernetes.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/label.pb.go b/securitycenter/apiv1/securitycenterpb/label.pb.go
index 7a19a7b7677..3c44b266f8a 100644
--- a/securitycenter/apiv1/securitycenterpb/label.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/label.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/label.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/mitre_attack.pb.go b/securitycenter/apiv1/securitycenterpb/mitre_attack.pb.go
index 828c71efa51..05bed9e84f5 100644
--- a/securitycenter/apiv1/securitycenterpb/mitre_attack.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/mitre_attack.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/mitre_attack.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/mute_config.pb.go b/securitycenter/apiv1/securitycenterpb/mute_config.pb.go
index a8d1b509a68..d96d01a2093 100644
--- a/securitycenter/apiv1/securitycenterpb/mute_config.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/mute_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/mute_config.proto
 
 package securitycenterpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -79,11 +79,11 @@ type MuteConfig struct {
 	// Output only. The time at which the mute config was created.
 	// This field is set by the server and will be ignored if provided on config
 	// creation.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The most recent time at which the mute config was updated.
 	// This field is set by the server and will be ignored if provided on config
 	// creation or update.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. Email address of the user who last edited the mute config.
 	// This field is set by the server and will be ignored if provided on config
 	// creation or update.
@@ -151,14 +151,14 @@ func (x *MuteConfig) GetFilter() string {
 	return ""
 }
 
-func (x *MuteConfig) GetCreateTime() *timestamp.Timestamp {
+func (x *MuteConfig) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *MuteConfig) GetUpdateTime() *timestamp.Timestamp {
+func (x *MuteConfig) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -250,8 +250,8 @@ func file_google_cloud_securitycenter_v1_mute_config_proto_rawDescGZIP() []byte
 
 var file_google_cloud_securitycenter_v1_mute_config_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_securitycenter_v1_mute_config_proto_goTypes = []interface{}{
-	(*MuteConfig)(nil),          // 0: google.cloud.securitycenter.v1.MuteConfig
-	(*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp
+	(*MuteConfig)(nil),            // 0: google.cloud.securitycenter.v1.MuteConfig
+	(*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp
 }
 var file_google_cloud_securitycenter_v1_mute_config_proto_depIdxs = []int32{
 	1, // 0: google.cloud.securitycenter.v1.MuteConfig.create_time:type_name -> google.protobuf.Timestamp
diff --git a/securitycenter/apiv1/securitycenterpb/notification_config.pb.go b/securitycenter/apiv1/securitycenterpb/notification_config.pb.go
index 2b177f477d7..28b9edca231 100644
--- a/securitycenter/apiv1/securitycenterpb/notification_config.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/notification_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/notification_config.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/notification_message.pb.go b/securitycenter/apiv1/securitycenterpb/notification_message.pb.go
index da1ba81a3c9..27a2930c32c 100644
--- a/securitycenter/apiv1/securitycenterpb/notification_message.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/notification_message.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/notification_message.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/organization_settings.pb.go b/securitycenter/apiv1/securitycenterpb/organization_settings.pb.go
index b2b9711858c..95b8c1d1f68 100644
--- a/securitycenter/apiv1/securitycenterpb/organization_settings.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/organization_settings.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/organization_settings.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/process.pb.go b/securitycenter/apiv1/securitycenterpb/process.pb.go
index 95c4a301b08..2300cb2d2ff 100644
--- a/securitycenter/apiv1/securitycenterpb/process.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/process.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/process.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/resource.pb.go b/securitycenter/apiv1/securitycenterpb/resource.pb.go
index 4dac8a6932b..0f7a8345318 100644
--- a/securitycenter/apiv1/securitycenterpb/resource.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/resource.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/resource.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/run_asset_discovery_response.pb.go b/securitycenter/apiv1/securitycenterpb/run_asset_discovery_response.pb.go
index 090ce48601b..abd382662a7 100644
--- a/securitycenter/apiv1/securitycenterpb/run_asset_discovery_response.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/run_asset_discovery_response.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/run_asset_discovery_response.proto
 
 package securitycenterpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -103,7 +103,7 @@ type RunAssetDiscoveryResponse struct {
 	// The state of an asset discovery run.
 	State RunAssetDiscoveryResponse_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.securitycenter.v1.RunAssetDiscoveryResponse_State" json:"state,omitempty"`
 	// The duration between asset discovery run start and end
-	Duration *duration.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,2,opt,name=duration,proto3" json:"duration,omitempty"`
 }
 
 func (x *RunAssetDiscoveryResponse) Reset() {
@@ -145,7 +145,7 @@ func (x *RunAssetDiscoveryResponse) GetState() RunAssetDiscoveryResponse_State {
 	return RunAssetDiscoveryResponse_STATE_UNSPECIFIED
 }
 
-func (x *RunAssetDiscoveryResponse) GetDuration() *duration.Duration {
+func (x *RunAssetDiscoveryResponse) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -213,7 +213,7 @@ var file_google_cloud_securitycenter_v1_run_asset_discovery_response_proto_msgTy
 var file_google_cloud_securitycenter_v1_run_asset_discovery_response_proto_goTypes = []interface{}{
 	(RunAssetDiscoveryResponse_State)(0), // 0: google.cloud.securitycenter.v1.RunAssetDiscoveryResponse.State
 	(*RunAssetDiscoveryResponse)(nil),    // 1: google.cloud.securitycenter.v1.RunAssetDiscoveryResponse
-	(*duration.Duration)(nil),            // 2: google.protobuf.Duration
+	(*durationpb.Duration)(nil),          // 2: google.protobuf.Duration
 }
 var file_google_cloud_securitycenter_v1_run_asset_discovery_response_proto_depIdxs = []int32{
 	0, // 0: google.cloud.securitycenter.v1.RunAssetDiscoveryResponse.state:type_name -> google.cloud.securitycenter.v1.RunAssetDiscoveryResponse.State
diff --git a/securitycenter/apiv1/securitycenterpb/security_marks.pb.go b/securitycenter/apiv1/securitycenterpb/security_marks.pb.go
index 6d6be9a596d..f9d08de8e10 100644
--- a/securitycenter/apiv1/securitycenterpb/security_marks.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/security_marks.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/security_marks.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/securitycenter_service.pb.go b/securitycenter/apiv1/securitycenterpb/securitycenter_service.pb.go
index c041ac2f08b..a133e6db6ea 100644
--- a/securitycenter/apiv1/securitycenterpb/securitycenter_service.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/securitycenter_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/securitycenter_service.proto
 
 package securitycenterpb
@@ -25,19 +25,19 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	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"
 	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1068,12 +1068,12 @@ type GroupAssetsRequest struct {
 	//
 	// If this field is set then `state_change` must be a specified field in
 	// `group_by`.
-	CompareDuration *duration.Duration `protobuf:"bytes,4,opt,name=compare_duration,json=compareDuration,proto3" json:"compare_duration,omitempty"`
+	CompareDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=compare_duration,json=compareDuration,proto3" json:"compare_duration,omitempty"`
 	// Time used as a reference point when filtering assets. The filter is limited
 	// to assets existing at the supplied time and their values are those at that
 	// specific time. Absence of this field will default to the API's version of
 	// NOW.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// The value returned by the last `GroupAssetsResponse`; indicates
 	// that this is a continuation of a prior `GroupAssets` call, and that the
 	// system should return the next page of data.
@@ -1136,14 +1136,14 @@ func (x *GroupAssetsRequest) GetGroupBy() string {
 	return ""
 }
 
-func (x *GroupAssetsRequest) GetCompareDuration() *duration.Duration {
+func (x *GroupAssetsRequest) GetCompareDuration() *durationpb.Duration {
 	if x != nil {
 		return x.CompareDuration
 	}
 	return nil
 }
 
-func (x *GroupAssetsRequest) GetReadTime() *timestamp.Timestamp {
+func (x *GroupAssetsRequest) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -1175,7 +1175,7 @@ type GroupAssetsResponse struct {
 	// of times those specific property/values appear.
 	GroupByResults []*GroupResult `protobuf:"bytes,1,rep,name=group_by_results,json=groupByResults,proto3" json:"group_by_results,omitempty"`
 	// Time used for executing the groupBy request.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no more
 	// results.
 	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
@@ -1222,7 +1222,7 @@ func (x *GroupAssetsResponse) GetGroupByResults() []*GroupResult {
 	return nil
 }
 
-func (x *GroupAssetsResponse) GetReadTime() *timestamp.Timestamp {
+func (x *GroupAssetsResponse) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -1337,7 +1337,7 @@ type GroupFindingsRequest struct {
 	// limited to findings existing at the supplied time and their values are
 	// those at that specific time. Absence of this field will default to the
 	// API's version of NOW.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// When compare_duration is set, the GroupResult's "state_change" attribute is
 	// updated to indicate whether the finding had its state changed, the
 	// finding's state remained unchanged, or if the finding was added during the
@@ -1370,7 +1370,7 @@ type GroupFindingsRequest struct {
 	//
 	// If this field is set then `state_change` must be a specified field in
 	// `group_by`.
-	CompareDuration *duration.Duration `protobuf:"bytes,5,opt,name=compare_duration,json=compareDuration,proto3" json:"compare_duration,omitempty"`
+	CompareDuration *durationpb.Duration `protobuf:"bytes,5,opt,name=compare_duration,json=compareDuration,proto3" json:"compare_duration,omitempty"`
 	// The value returned by the last `GroupFindingsResponse`; indicates
 	// that this is a continuation of a prior `GroupFindings` call, and
 	// that the system should return the next page of data.
@@ -1433,14 +1433,14 @@ func (x *GroupFindingsRequest) GetGroupBy() string {
 	return ""
 }
 
-func (x *GroupFindingsRequest) GetReadTime() *timestamp.Timestamp {
+func (x *GroupFindingsRequest) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
 	return nil
 }
 
-func (x *GroupFindingsRequest) GetCompareDuration() *duration.Duration {
+func (x *GroupFindingsRequest) GetCompareDuration() *durationpb.Duration {
 	if x != nil {
 		return x.CompareDuration
 	}
@@ -1472,7 +1472,7 @@ type GroupFindingsResponse struct {
 	// of times those specific property/values appear.
 	GroupByResults []*GroupResult `protobuf:"bytes,1,rep,name=group_by_results,json=groupByResults,proto3" json:"group_by_results,omitempty"`
 	// Time used for executing the groupBy request.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no more
 	// results.
 	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
@@ -1519,7 +1519,7 @@ func (x *GroupFindingsResponse) GetGroupByResults() []*GroupResult {
 	return nil
 }
 
-func (x *GroupFindingsResponse) GetReadTime() *timestamp.Timestamp {
+func (x *GroupFindingsResponse) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -1547,7 +1547,7 @@ type GroupResult struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Properties matching the groupBy fields in the request.
-	Properties map[string]*_struct.Value `protobuf:"bytes,1,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Properties map[string]*structpb.Value `protobuf:"bytes,1,rep,name=properties,proto3" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Total count of resources for the given properties.
 	Count int64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"`
 }
@@ -1584,7 +1584,7 @@ func (*GroupResult) Descriptor() ([]byte, []int) {
 	return file_google_cloud_securitycenter_v1_securitycenter_service_proto_rawDescGZIP(), []int{17}
 }
 
-func (x *GroupResult) GetProperties() map[string]*_struct.Value {
+func (x *GroupResult) GetProperties() map[string]*structpb.Value {
 	if x != nil {
 		return x.Properties
 	}
@@ -2095,7 +2095,7 @@ type ListAssetsRequest struct {
 	// to assets existing at the supplied time and their values are those at that
 	// specific time. Absence of this field will default to the API's version of
 	// NOW.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// When compare_duration is set, the ListAssetsResult's "state_change"
 	// attribute is updated to indicate whether the asset was added, removed, or
 	// remained present during the compare_duration period of time that precedes
@@ -2120,11 +2120,11 @@ type ListAssetsRequest struct {
 	// If compare_duration is not specified, then the only possible state_change
 	// is "UNUSED",  which will be the state_change set for all assets present at
 	// read_time.
-	CompareDuration *duration.Duration `protobuf:"bytes,5,opt,name=compare_duration,json=compareDuration,proto3" json:"compare_duration,omitempty"`
+	CompareDuration *durationpb.Duration `protobuf:"bytes,5,opt,name=compare_duration,json=compareDuration,proto3" json:"compare_duration,omitempty"`
 	// A field mask to specify the ListAssetsResult fields to be listed in the
 	// response.
 	// An empty field mask will list all fields.
-	FieldMask *field_mask.FieldMask `protobuf:"bytes,7,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
+	FieldMask *fieldmaskpb.FieldMask `protobuf:"bytes,7,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
 	// The value returned by the last `ListAssetsResponse`; indicates
 	// that this is a continuation of a prior `ListAssets` call, and
 	// that the system should return the next page of data.
@@ -2187,21 +2187,21 @@ func (x *ListAssetsRequest) GetOrderBy() string {
 	return ""
 }
 
-func (x *ListAssetsRequest) GetReadTime() *timestamp.Timestamp {
+func (x *ListAssetsRequest) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
 	return nil
 }
 
-func (x *ListAssetsRequest) GetCompareDuration() *duration.Duration {
+func (x *ListAssetsRequest) GetCompareDuration() *durationpb.Duration {
 	if x != nil {
 		return x.CompareDuration
 	}
 	return nil
 }
 
-func (x *ListAssetsRequest) GetFieldMask() *field_mask.FieldMask {
+func (x *ListAssetsRequest) GetFieldMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.FieldMask
 	}
@@ -2231,7 +2231,7 @@ type ListAssetsResponse struct {
 	// Assets matching the list request.
 	ListAssetsResults []*ListAssetsResponse_ListAssetsResult `protobuf:"bytes,1,rep,name=list_assets_results,json=listAssetsResults,proto3" json:"list_assets_results,omitempty"`
 	// Time used for executing the list request.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no more
 	// results.
 	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
@@ -2278,7 +2278,7 @@ func (x *ListAssetsResponse) GetListAssetsResults() []*ListAssetsResponse_ListAs
 	return nil
 }
 
-func (x *ListAssetsResponse) GetReadTime() *timestamp.Timestamp {
+func (x *ListAssetsResponse) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -2398,7 +2398,7 @@ type ListFindingsRequest struct {
 	// limited to findings existing at the supplied time and their values are
 	// those at that specific time. Absence of this field will default to the
 	// API's version of NOW.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// When compare_duration is set, the ListFindingsResult's "state_change"
 	// attribute is updated to indicate whether the finding had its state changed,
 	// the finding's state remained unchanged, or if the finding was added in any
@@ -2429,10 +2429,10 @@ type ListFindingsRequest struct {
 	// If compare_duration is not specified, then the only possible state_change
 	// is "UNUSED", which will be the state_change set for all findings present at
 	// read_time.
-	CompareDuration *duration.Duration `protobuf:"bytes,5,opt,name=compare_duration,json=compareDuration,proto3" json:"compare_duration,omitempty"`
+	CompareDuration *durationpb.Duration `protobuf:"bytes,5,opt,name=compare_duration,json=compareDuration,proto3" json:"compare_duration,omitempty"`
 	// A field mask to specify the Finding fields to be listed in the response.
 	// An empty field mask will list all fields.
-	FieldMask *field_mask.FieldMask `protobuf:"bytes,7,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
+	FieldMask *fieldmaskpb.FieldMask `protobuf:"bytes,7,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"`
 	// The value returned by the last `ListFindingsResponse`; indicates
 	// that this is a continuation of a prior `ListFindings` call, and
 	// that the system should return the next page of data.
@@ -2495,21 +2495,21 @@ func (x *ListFindingsRequest) GetOrderBy() string {
 	return ""
 }
 
-func (x *ListFindingsRequest) GetReadTime() *timestamp.Timestamp {
+func (x *ListFindingsRequest) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
 	return nil
 }
 
-func (x *ListFindingsRequest) GetCompareDuration() *duration.Duration {
+func (x *ListFindingsRequest) GetCompareDuration() *durationpb.Duration {
 	if x != nil {
 		return x.CompareDuration
 	}
 	return nil
 }
 
-func (x *ListFindingsRequest) GetFieldMask() *field_mask.FieldMask {
+func (x *ListFindingsRequest) GetFieldMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.FieldMask
 	}
@@ -2539,7 +2539,7 @@ type ListFindingsResponse struct {
 	// Findings matching the list request.
 	ListFindingsResults []*ListFindingsResponse_ListFindingsResult `protobuf:"bytes,1,rep,name=list_findings_results,json=listFindingsResults,proto3" json:"list_findings_results,omitempty"`
 	// Time used for executing the list request.
-	ReadTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
+	ReadTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=read_time,json=readTime,proto3" json:"read_time,omitempty"`
 	// Token to retrieve the next page of results, or empty if there are no more
 	// results.
 	NextPageToken string `protobuf:"bytes,3,opt,name=next_page_token,json=nextPageToken,proto3" json:"next_page_token,omitempty"`
@@ -2586,7 +2586,7 @@ func (x *ListFindingsResponse) GetListFindingsResults() []*ListFindingsResponse_
 	return nil
 }
 
-func (x *ListFindingsResponse) GetReadTime() *timestamp.Timestamp {
+func (x *ListFindingsResponse) GetReadTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ReadTime
 	}
@@ -2621,7 +2621,7 @@ type SetFindingStateRequest struct {
 	// Required. The desired State of the finding.
 	State Finding_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.cloud.securitycenter.v1.Finding_State" json:"state,omitempty"`
 	// Required. The time at which the updated state takes effect.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 }
 
 func (x *SetFindingStateRequest) Reset() {
@@ -2670,7 +2670,7 @@ func (x *SetFindingStateRequest) GetState() Finding_State {
 	return Finding_STATE_UNSPECIFIED
 }
 
-func (x *SetFindingStateRequest) GetStartTime() *timestamp.Timestamp {
+func (x *SetFindingStateRequest) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -2801,7 +2801,7 @@ type UpdateExternalSystemRequest struct {
 	// The FieldMask to use when updating the external system resource.
 	//
 	// If empty all mutable fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateExternalSystemRequest) Reset() {
@@ -2843,7 +2843,7 @@ func (x *UpdateExternalSystemRequest) GetExternalSystem() *ExternalSystem {
 	return nil
 }
 
-func (x *UpdateExternalSystemRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateExternalSystemRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2870,7 +2870,7 @@ type UpdateFindingRequest struct {
 	// fields and replacing source_properties.  Individual source_properties can
 	// be added/updated by using "source_properties.<property key>" in the field
 	// mask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateFindingRequest) Reset() {
@@ -2912,7 +2912,7 @@ func (x *UpdateFindingRequest) GetFinding() *Finding {
 	return nil
 }
 
-func (x *UpdateFindingRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateFindingRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2929,7 +2929,7 @@ type UpdateMuteConfigRequest struct {
 	MuteConfig *MuteConfig `protobuf:"bytes,1,opt,name=mute_config,json=muteConfig,proto3" json:"mute_config,omitempty"`
 	// The list of fields to be updated.
 	// If empty all mutable fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateMuteConfigRequest) Reset() {
@@ -2971,7 +2971,7 @@ func (x *UpdateMuteConfigRequest) GetMuteConfig() *MuteConfig {
 	return nil
 }
 
-func (x *UpdateMuteConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateMuteConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2989,7 +2989,7 @@ type UpdateNotificationConfigRequest struct {
 	// The FieldMask to use when updating the notification config.
 	//
 	// If empty all mutable fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateNotificationConfigRequest) Reset() {
@@ -3031,7 +3031,7 @@ func (x *UpdateNotificationConfigRequest) GetNotificationConfig() *NotificationC
 	return nil
 }
 
-func (x *UpdateNotificationConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateNotificationConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3049,7 +3049,7 @@ type UpdateOrganizationSettingsRequest struct {
 	// The FieldMask to use when updating the settings resource.
 	//
 	// If empty all mutable fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateOrganizationSettingsRequest) Reset() {
@@ -3091,7 +3091,7 @@ func (x *UpdateOrganizationSettingsRequest) GetOrganizationSettings() *Organizat
 	return nil
 }
 
-func (x *UpdateOrganizationSettingsRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateOrganizationSettingsRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3109,7 +3109,7 @@ type UpdateSourceRequest struct {
 	// The FieldMask to use when updating the source resource.
 	//
 	// If empty all mutable fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSourceRequest) Reset() {
@@ -3151,7 +3151,7 @@ func (x *UpdateSourceRequest) GetSource() *Source {
 	return nil
 }
 
-func (x *UpdateSourceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSourceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3171,12 +3171,12 @@ type UpdateSecurityMarksRequest struct {
 	// The field mask must not contain duplicate fields.
 	// If empty or set to "marks", all marks will be replaced.  Individual
 	// marks can be updated using "marks.<mark_key>".
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// The time at which the updated SecurityMarks take effect.
 	// If not set uses current server time.  Updates will be applied to the
 	// SecurityMarks that are active immediately preceding this time. Must be
 	// earlier or equal to the server time.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 }
 
 func (x *UpdateSecurityMarksRequest) Reset() {
@@ -3218,14 +3218,14 @@ func (x *UpdateSecurityMarksRequest) GetSecurityMarks() *SecurityMarks {
 	return nil
 }
 
-func (x *UpdateSecurityMarksRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSecurityMarksRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
 	return nil
 }
 
-func (x *UpdateSecurityMarksRequest) GetStartTime() *timestamp.Timestamp {
+func (x *UpdateSecurityMarksRequest) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -3314,7 +3314,7 @@ type UpdateBigQueryExportRequest struct {
 	BigQueryExport *BigQueryExport `protobuf:"bytes,1,opt,name=big_query_export,json=bigQueryExport,proto3" json:"big_query_export,omitempty"`
 	// The list of fields to be updated.
 	// If empty all mutable fields will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateBigQueryExportRequest) Reset() {
@@ -3356,7 +3356,7 @@ func (x *UpdateBigQueryExportRequest) GetBigQueryExport() *BigQueryExport {
 	return nil
 }
 
-func (x *UpdateBigQueryExportRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateBigQueryExportRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -5183,23 +5183,23 @@ var file_google_cloud_securitycenter_v1_securitycenter_service_proto_goTypes = [
 	(*MuteConfig)(nil),                                       // 50: google.cloud.securitycenter.v1.MuteConfig
 	(*NotificationConfig)(nil),                               // 51: google.cloud.securitycenter.v1.NotificationConfig
 	(*Source)(nil),                                           // 52: google.cloud.securitycenter.v1.Source
-	(*duration.Duration)(nil),                                // 53: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),                              // 54: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),                             // 55: google.protobuf.FieldMask
+	(*durationpb.Duration)(nil),                              // 53: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),                            // 54: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil),                            // 55: google.protobuf.FieldMask
 	(Finding_State)(0),                                       // 56: google.cloud.securitycenter.v1.Finding.State
 	(Finding_Mute)(0),                                        // 57: google.cloud.securitycenter.v1.Finding.Mute
 	(*ExternalSystem)(nil),                                   // 58: google.cloud.securitycenter.v1.ExternalSystem
 	(*OrganizationSettings)(nil),                             // 59: google.cloud.securitycenter.v1.OrganizationSettings
 	(*SecurityMarks)(nil),                                    // 60: google.cloud.securitycenter.v1.SecurityMarks
 	(*BigQueryExport)(nil),                                   // 61: google.cloud.securitycenter.v1.BigQueryExport
-	(*_struct.Value)(nil),                                    // 62: google.protobuf.Value
+	(*structpb.Value)(nil),                                   // 62: google.protobuf.Value
 	(*Asset)(nil),                                            // 63: google.cloud.securitycenter.v1.Asset
 	(*Folder)(nil),                                           // 64: google.cloud.securitycenter.v1.Folder
 	(*v1.GetIamPolicyRequest)(nil),                           // 65: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),                           // 66: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),                     // 67: google.iam.v1.TestIamPermissionsRequest
 	(*longrunning.Operation)(nil),                            // 68: google.longrunning.Operation
-	(*empty.Empty)(nil),                                      // 69: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                    // 69: google.protobuf.Empty
 	(*v1.Policy)(nil),                                        // 70: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil),                    // 71: google.iam.v1.TestIamPermissionsResponse
 }
@@ -5955,9 +5955,9 @@ type SecurityCenterClient interface {
 	// Creates a notification config.
 	CreateNotificationConfig(ctx context.Context, in *CreateNotificationConfigRequest, opts ...grpc.CallOption) (*NotificationConfig, error)
 	// Deletes an existing mute config.
-	DeleteMuteConfig(ctx context.Context, in *DeleteMuteConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteMuteConfig(ctx context.Context, in *DeleteMuteConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Deletes a notification config.
-	DeleteNotificationConfig(ctx context.Context, in *DeleteNotificationConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteNotificationConfig(ctx context.Context, in *DeleteNotificationConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets a big query export.
 	GetBigQueryExport(ctx context.Context, in *GetBigQueryExportRequest, opts ...grpc.CallOption) (*BigQueryExport, error)
 	// Gets the access control policy on the specified Source.
@@ -6028,7 +6028,7 @@ type SecurityCenterClient interface {
 	// Creates a big query export.
 	CreateBigQueryExport(ctx context.Context, in *CreateBigQueryExportRequest, opts ...grpc.CallOption) (*BigQueryExport, error)
 	// Deletes an existing big query export.
-	DeleteBigQueryExport(ctx context.Context, in *DeleteBigQueryExportRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteBigQueryExport(ctx context.Context, in *DeleteBigQueryExportRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates a BigQuery export.
 	UpdateBigQueryExport(ctx context.Context, in *UpdateBigQueryExportRequest, opts ...grpc.CallOption) (*BigQueryExport, error)
 	// Lists BigQuery exports. Note that when requesting BigQuery exports at a
@@ -6092,8 +6092,8 @@ func (c *securityCenterClient) CreateNotificationConfig(ctx context.Context, in
 	return out, nil
 }
 
-func (c *securityCenterClient) DeleteMuteConfig(ctx context.Context, in *DeleteMuteConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *securityCenterClient) DeleteMuteConfig(ctx context.Context, in *DeleteMuteConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.securitycenter.v1.SecurityCenter/DeleteMuteConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -6101,8 +6101,8 @@ func (c *securityCenterClient) DeleteMuteConfig(ctx context.Context, in *DeleteM
 	return out, nil
 }
 
-func (c *securityCenterClient) DeleteNotificationConfig(ctx context.Context, in *DeleteNotificationConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *securityCenterClient) DeleteNotificationConfig(ctx context.Context, in *DeleteNotificationConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.securitycenter.v1.SecurityCenter/DeleteNotificationConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -6344,8 +6344,8 @@ func (c *securityCenterClient) CreateBigQueryExport(ctx context.Context, in *Cre
 	return out, nil
 }
 
-func (c *securityCenterClient) DeleteBigQueryExport(ctx context.Context, in *DeleteBigQueryExportRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *securityCenterClient) DeleteBigQueryExport(ctx context.Context, in *DeleteBigQueryExportRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.securitycenter.v1.SecurityCenter/DeleteBigQueryExport", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -6387,9 +6387,9 @@ type SecurityCenterServer interface {
 	// Creates a notification config.
 	CreateNotificationConfig(context.Context, *CreateNotificationConfigRequest) (*NotificationConfig, error)
 	// Deletes an existing mute config.
-	DeleteMuteConfig(context.Context, *DeleteMuteConfigRequest) (*empty.Empty, error)
+	DeleteMuteConfig(context.Context, *DeleteMuteConfigRequest) (*emptypb.Empty, error)
 	// Deletes a notification config.
-	DeleteNotificationConfig(context.Context, *DeleteNotificationConfigRequest) (*empty.Empty, error)
+	DeleteNotificationConfig(context.Context, *DeleteNotificationConfigRequest) (*emptypb.Empty, error)
 	// Gets a big query export.
 	GetBigQueryExport(context.Context, *GetBigQueryExportRequest) (*BigQueryExport, error)
 	// Gets the access control policy on the specified Source.
@@ -6460,7 +6460,7 @@ type SecurityCenterServer interface {
 	// Creates a big query export.
 	CreateBigQueryExport(context.Context, *CreateBigQueryExportRequest) (*BigQueryExport, error)
 	// Deletes an existing big query export.
-	DeleteBigQueryExport(context.Context, *DeleteBigQueryExportRequest) (*empty.Empty, error)
+	DeleteBigQueryExport(context.Context, *DeleteBigQueryExportRequest) (*emptypb.Empty, error)
 	// Updates a BigQuery export.
 	UpdateBigQueryExport(context.Context, *UpdateBigQueryExportRequest) (*BigQueryExport, error)
 	// Lists BigQuery exports. Note that when requesting BigQuery exports at a
@@ -6490,10 +6490,10 @@ func (*UnimplementedSecurityCenterServer) CreateMuteConfig(context.Context, *Cre
 func (*UnimplementedSecurityCenterServer) CreateNotificationConfig(context.Context, *CreateNotificationConfigRequest) (*NotificationConfig, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateNotificationConfig not implemented")
 }
-func (*UnimplementedSecurityCenterServer) DeleteMuteConfig(context.Context, *DeleteMuteConfigRequest) (*empty.Empty, error) {
+func (*UnimplementedSecurityCenterServer) DeleteMuteConfig(context.Context, *DeleteMuteConfigRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteMuteConfig not implemented")
 }
-func (*UnimplementedSecurityCenterServer) DeleteNotificationConfig(context.Context, *DeleteNotificationConfigRequest) (*empty.Empty, error) {
+func (*UnimplementedSecurityCenterServer) DeleteNotificationConfig(context.Context, *DeleteNotificationConfigRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteNotificationConfig not implemented")
 }
 func (*UnimplementedSecurityCenterServer) GetBigQueryExport(context.Context, *GetBigQueryExportRequest) (*BigQueryExport, error) {
@@ -6574,7 +6574,7 @@ func (*UnimplementedSecurityCenterServer) UpdateSecurityMarks(context.Context, *
 func (*UnimplementedSecurityCenterServer) CreateBigQueryExport(context.Context, *CreateBigQueryExportRequest) (*BigQueryExport, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateBigQueryExport not implemented")
 }
-func (*UnimplementedSecurityCenterServer) DeleteBigQueryExport(context.Context, *DeleteBigQueryExportRequest) (*empty.Empty, error) {
+func (*UnimplementedSecurityCenterServer) DeleteBigQueryExport(context.Context, *DeleteBigQueryExportRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteBigQueryExport not implemented")
 }
 func (*UnimplementedSecurityCenterServer) UpdateBigQueryExport(context.Context, *UpdateBigQueryExportRequest) (*BigQueryExport, error) {
diff --git a/securitycenter/apiv1/securitycenterpb/source.pb.go b/securitycenter/apiv1/securitycenterpb/source.pb.go
index 53f43d0c4af..91556ecb4f3 100644
--- a/securitycenter/apiv1/securitycenterpb/source.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/source.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/source.proto
 
 package securitycenterpb
diff --git a/securitycenter/apiv1/securitycenterpb/vulnerability.pb.go b/securitycenter/apiv1/securitycenterpb/vulnerability.pb.go
index ebb7cbe92bc..4035e26458b 100644
--- a/securitycenter/apiv1/securitycenterpb/vulnerability.pb.go
+++ b/securitycenter/apiv1/securitycenterpb/vulnerability.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/securitycenter/v1/vulnerability.proto
 
 package securitycenterpb
diff --git a/securitycenter/go.mod b/securitycenter/go.mod
index fcd94f3cf78..bf8948497ab 100644
--- a/securitycenter/go.mod
+++ b/securitycenter/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/securitycenter
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/securitycenter/go.sum b/securitycenter/go.sum
index b4fa5e4c13c..197b62f3d3c 100644
--- a/securitycenter/go.sum
+++ b/securitycenter/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c h1:+o+fjzgkPaHAQDdk5gGX4DZF99huQ0BMqgOqx4SwyJw=
-google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/servicecontrol/aliasshim/aliasshim.go b/servicecontrol/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/servicecontrol/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/servicecontrol/apiv1/doc.go b/servicecontrol/apiv1/doc.go
index 600939b7407..bd6d29ca2e2 100644
--- a/servicecontrol/apiv1/doc.go
+++ b/servicecontrol/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &servicecontrolpb.AllocateQuotaRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicecontrol/v1#AllocateQuotaRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb#AllocateQuotaRequest.
 //	}
 //	resp, err := c.AllocateQuota(ctx, req)
 //	if err != nil {
diff --git a/servicecontrol/apiv1/quota_controller_client.go b/servicecontrol/apiv1/quota_controller_client.go
index 805e27da1d0..4fe33cc3b23 100644
--- a/servicecontrol/apiv1/quota_controller_client.go
+++ b/servicecontrol/apiv1/quota_controller_client.go
@@ -22,11 +22,11 @@ import (
 	"math"
 	"net/url"
 
+	servicecontrolpb "cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	servicecontrolpb "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/servicecontrol/apiv1/quota_controller_client_example_test.go b/servicecontrol/apiv1/quota_controller_client_example_test.go
index c08e2a146f4..61c44527b9b 100644
--- a/servicecontrol/apiv1/quota_controller_client_example_test.go
+++ b/servicecontrol/apiv1/quota_controller_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	servicecontrol "cloud.google.com/go/servicecontrol/apiv1"
-	servicecontrolpb "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+	servicecontrolpb "cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb"
 )
 
 func ExampleNewQuotaControllerClient() {
@@ -55,7 +55,7 @@ func ExampleQuotaControllerClient_AllocateQuota() {
 
 	req := &servicecontrolpb.AllocateQuotaRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicecontrol/v1#AllocateQuotaRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb#AllocateQuotaRequest.
 	}
 	resp, err := c.AllocateQuota(ctx, req)
 	if err != nil {
diff --git a/servicecontrol/apiv1/service_controller_client.go b/servicecontrol/apiv1/service_controller_client.go
index 5f99ca2e830..26b806ea35b 100644
--- a/servicecontrol/apiv1/service_controller_client.go
+++ b/servicecontrol/apiv1/service_controller_client.go
@@ -22,11 +22,11 @@ import (
 	"math"
 	"net/url"
 
+	servicecontrolpb "cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	servicecontrolpb "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )
diff --git a/servicecontrol/apiv1/service_controller_client_example_test.go b/servicecontrol/apiv1/service_controller_client_example_test.go
index 0bbc3a7933f..33fe7e72aab 100644
--- a/servicecontrol/apiv1/service_controller_client_example_test.go
+++ b/servicecontrol/apiv1/service_controller_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	servicecontrol "cloud.google.com/go/servicecontrol/apiv1"
-	servicecontrolpb "google.golang.org/genproto/googleapis/api/servicecontrol/v1"
+	servicecontrolpb "cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb"
 )
 
 func ExampleNewServiceControllerClient() {
@@ -55,7 +55,7 @@ func ExampleServiceControllerClient_Check() {
 
 	req := &servicecontrolpb.CheckRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicecontrol/v1#CheckRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb#CheckRequest.
 	}
 	resp, err := c.Check(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleServiceControllerClient_Report() {
 
 	req := &servicecontrolpb.ReportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicecontrol/v1#ReportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicecontrol/apiv1/servicecontrolpb#ReportRequest.
 	}
 	resp, err := c.Report(ctx, req)
 	if err != nil {
diff --git a/servicecontrol/apiv1/servicecontrolpb/check_error.pb.go b/servicecontrol/apiv1/servicecontrolpb/check_error.pb.go
index 0f8054de955..7a41faea854 100644
--- a/servicecontrol/apiv1/servicecontrolpb/check_error.pb.go
+++ b/servicecontrol/apiv1/servicecontrolpb/check_error.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicecontrol/v1/check_error.proto
 
 package servicecontrolpb
diff --git a/servicecontrol/apiv1/servicecontrolpb/distribution.pb.go b/servicecontrol/apiv1/servicecontrolpb/distribution.pb.go
index ceefc703765..455b2710478 100644
--- a/servicecontrol/apiv1/servicecontrolpb/distribution.pb.go
+++ b/servicecontrol/apiv1/servicecontrolpb/distribution.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicecontrol/v1/distribution.proto
 
 package servicecontrolpb
diff --git a/servicecontrol/apiv1/servicecontrolpb/http_request.pb.go b/servicecontrol/apiv1/servicecontrolpb/http_request.pb.go
index 65ec7824c1b..b52c700dcfe 100644
--- a/servicecontrol/apiv1/servicecontrolpb/http_request.pb.go
+++ b/servicecontrol/apiv1/servicecontrolpb/http_request.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicecontrol/v1/http_request.proto
 
 package servicecontrolpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -75,7 +75,7 @@ type HttpRequest struct {
 	Referer string `protobuf:"bytes,8,opt,name=referer,proto3" json:"referer,omitempty"`
 	// The request processing latency on the server, from the time the request was
 	// received until the response was sent.
-	Latency *duration.Duration `protobuf:"bytes,14,opt,name=latency,proto3" json:"latency,omitempty"`
+	Latency *durationpb.Duration `protobuf:"bytes,14,opt,name=latency,proto3" json:"latency,omitempty"`
 	// Whether or not a cache lookup was attempted.
 	CacheLookup bool `protobuf:"varint,11,opt,name=cache_lookup,json=cacheLookup,proto3" json:"cache_lookup,omitempty"`
 	// Whether or not an entity was served from cache
@@ -187,7 +187,7 @@ func (x *HttpRequest) GetReferer() string {
 	return ""
 }
 
-func (x *HttpRequest) GetLatency() *duration.Duration {
+func (x *HttpRequest) GetLatency() *durationpb.Duration {
 	if x != nil {
 		return x.Latency
 	}
@@ -306,8 +306,8 @@ func file_google_api_servicecontrol_v1_http_request_proto_rawDescGZIP() []byte {
 
 var file_google_api_servicecontrol_v1_http_request_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_api_servicecontrol_v1_http_request_proto_goTypes = []interface{}{
-	(*HttpRequest)(nil),       // 0: google.api.servicecontrol.v1.HttpRequest
-	(*duration.Duration)(nil), // 1: google.protobuf.Duration
+	(*HttpRequest)(nil),         // 0: google.api.servicecontrol.v1.HttpRequest
+	(*durationpb.Duration)(nil), // 1: google.protobuf.Duration
 }
 var file_google_api_servicecontrol_v1_http_request_proto_depIdxs = []int32{
 	1, // 0: google.api.servicecontrol.v1.HttpRequest.latency:type_name -> google.protobuf.Duration
diff --git a/servicecontrol/apiv1/servicecontrolpb/log_entry.pb.go b/servicecontrol/apiv1/servicecontrolpb/log_entry.pb.go
index 234cb6a03be..e0f6ad38409 100644
--- a/servicecontrol/apiv1/servicecontrolpb/log_entry.pb.go
+++ b/servicecontrol/apiv1/servicecontrolpb/log_entry.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicecontrol/v1/log_entry.proto
 
 package servicecontrolpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
-	_struct "github.com/golang/protobuf/ptypes/struct"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_type "google.golang.org/genproto/googleapis/logging/type"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -50,7 +50,7 @@ type LogEntry struct {
 	Name string `protobuf:"bytes,10,opt,name=name,proto3" json:"name,omitempty"`
 	// The time the event described by the log entry occurred. If
 	// omitted, defaults to operation start time.
-	Timestamp *timestamp.Timestamp `protobuf:"bytes,11,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	Timestamp *timestamppb.Timestamp `protobuf:"bytes,11,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
 	// The severity of the log entry. The default value is
 	// `LogSeverity.DEFAULT`.
 	Severity _type.LogSeverity `protobuf:"varint,12,opt,name=severity,proto3,enum=google.logging.type.LogSeverity" json:"severity,omitempty"`
@@ -123,7 +123,7 @@ func (x *LogEntry) GetName() string {
 	return ""
 }
 
-func (x *LogEntry) GetTimestamp() *timestamp.Timestamp {
+func (x *LogEntry) GetTimestamp() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Timestamp
 	}
@@ -172,7 +172,7 @@ func (m *LogEntry) GetPayload() isLogEntry_Payload {
 	return nil
 }
 
-func (x *LogEntry) GetProtoPayload() *any1.Any {
+func (x *LogEntry) GetProtoPayload() *anypb.Any {
 	if x, ok := x.GetPayload().(*LogEntry_ProtoPayload); ok {
 		return x.ProtoPayload
 	}
@@ -186,7 +186,7 @@ func (x *LogEntry) GetTextPayload() string {
 	return ""
 }
 
-func (x *LogEntry) GetStructPayload() *_struct.Struct {
+func (x *LogEntry) GetStructPayload() *structpb.Struct {
 	if x, ok := x.GetPayload().(*LogEntry_StructPayload); ok {
 		return x.StructPayload
 	}
@@ -215,7 +215,7 @@ type LogEntry_ProtoPayload struct {
 	// The log entry payload, represented as a protocol buffer that is
 	// expressed as a JSON object. The only accepted type currently is
 	// [AuditLog][google.cloud.audit.AuditLog].
-	ProtoPayload *any1.Any `protobuf:"bytes,2,opt,name=proto_payload,json=protoPayload,proto3,oneof"`
+	ProtoPayload *anypb.Any `protobuf:"bytes,2,opt,name=proto_payload,json=protoPayload,proto3,oneof"`
 }
 
 type LogEntry_TextPayload struct {
@@ -226,7 +226,7 @@ type LogEntry_TextPayload struct {
 type LogEntry_StructPayload struct {
 	// The log entry payload, represented as a structure that
 	// is expressed as a JSON object.
-	StructPayload *_struct.Struct `protobuf:"bytes,6,opt,name=struct_payload,json=structPayload,proto3,oneof"`
+	StructPayload *structpb.Struct `protobuf:"bytes,6,opt,name=struct_payload,json=structPayload,proto3,oneof"`
 }
 
 func (*LogEntry_ProtoPayload) isLogEntry_Payload() {}
@@ -505,11 +505,11 @@ var file_google_api_servicecontrol_v1_log_entry_proto_goTypes = []interface{}{
 	(*LogEntryOperation)(nil),      // 1: google.api.servicecontrol.v1.LogEntryOperation
 	(*LogEntrySourceLocation)(nil), // 2: google.api.servicecontrol.v1.LogEntrySourceLocation
 	nil,                            // 3: google.api.servicecontrol.v1.LogEntry.LabelsEntry
-	(*timestamp.Timestamp)(nil),    // 4: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),  // 4: google.protobuf.Timestamp
 	(_type.LogSeverity)(0),         // 5: google.logging.type.LogSeverity
 	(*HttpRequest)(nil),            // 6: google.api.servicecontrol.v1.HttpRequest
-	(*any1.Any)(nil),               // 7: google.protobuf.Any
-	(*_struct.Struct)(nil),         // 8: google.protobuf.Struct
+	(*anypb.Any)(nil),              // 7: google.protobuf.Any
+	(*structpb.Struct)(nil),        // 8: google.protobuf.Struct
 }
 var file_google_api_servicecontrol_v1_log_entry_proto_depIdxs = []int32{
 	4, // 0: google.api.servicecontrol.v1.LogEntry.timestamp:type_name -> google.protobuf.Timestamp
diff --git a/servicecontrol/apiv1/servicecontrolpb/metric_value.pb.go b/servicecontrol/apiv1/servicecontrolpb/metric_value.pb.go
index 397263befea..3565602de32 100644
--- a/servicecontrol/apiv1/servicecontrolpb/metric_value.pb.go
+++ b/servicecontrol/apiv1/servicecontrolpb/metric_value.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicecontrol/v1/metric_value.proto
 
 package servicecontrolpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -52,11 +52,11 @@ type MetricValue struct {
 	// types (cumulative, delta, and gauge). See the metric definition
 	// documentation in the service configuration for details. If not specified,
 	// [google.api.servicecontrol.v1.Operation.start_time][google.api.servicecontrol.v1.Operation.start_time] will be used.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The end of the time period over which this metric value's measurement
 	// applies.  If not specified,
 	// [google.api.servicecontrol.v1.Operation.end_time][google.api.servicecontrol.v1.Operation.end_time] will be used.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The value. The type of value used in the request must
 	// agree with the metric definition in the service configuration, otherwise
 	// the MetricValue is rejected.
@@ -110,14 +110,14 @@ func (x *MetricValue) GetLabels() map[string]string {
 	return nil
 }
 
-func (x *MetricValue) GetStartTime() *timestamp.Timestamp {
+func (x *MetricValue) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *MetricValue) GetEndTime() *timestamp.Timestamp {
+func (x *MetricValue) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -350,11 +350,11 @@ func file_google_api_servicecontrol_v1_metric_value_proto_rawDescGZIP() []byte {
 
 var file_google_api_servicecontrol_v1_metric_value_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_google_api_servicecontrol_v1_metric_value_proto_goTypes = []interface{}{
-	(*MetricValue)(nil),         // 0: google.api.servicecontrol.v1.MetricValue
-	(*MetricValueSet)(nil),      // 1: google.api.servicecontrol.v1.MetricValueSet
-	nil,                         // 2: google.api.servicecontrol.v1.MetricValue.LabelsEntry
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
-	(*Distribution)(nil),        // 4: google.api.servicecontrol.v1.Distribution
+	(*MetricValue)(nil),           // 0: google.api.servicecontrol.v1.MetricValue
+	(*MetricValueSet)(nil),        // 1: google.api.servicecontrol.v1.MetricValueSet
+	nil,                           // 2: google.api.servicecontrol.v1.MetricValue.LabelsEntry
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(*Distribution)(nil),          // 4: google.api.servicecontrol.v1.Distribution
 }
 var file_google_api_servicecontrol_v1_metric_value_proto_depIdxs = []int32{
 	2, // 0: google.api.servicecontrol.v1.MetricValue.labels:type_name -> google.api.servicecontrol.v1.MetricValue.LabelsEntry
diff --git a/servicecontrol/apiv1/servicecontrolpb/operation.pb.go b/servicecontrol/apiv1/servicecontrolpb/operation.pb.go
index 01c615f4ba1..6c56880fa14 100644
--- a/servicecontrol/apiv1/servicecontrolpb/operation.pb.go
+++ b/servicecontrol/apiv1/servicecontrolpb/operation.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicecontrol/v1/operation.proto
 
 package servicecontrolpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -121,13 +121,13 @@ type Operation struct {
 	//   - api`_`key:API_KEY.
 	ConsumerId string `protobuf:"bytes,3,opt,name=consumer_id,json=consumerId,proto3" json:"consumer_id,omitempty"`
 	// Required. Start time of the operation.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of the operation.
 	// Required when the operation is used in
 	// [ServiceController.Report][google.api.servicecontrol.v1.ServiceController.Report],
 	// but optional when the operation is used in
 	// [ServiceController.Check][google.api.servicecontrol.v1.ServiceController.Check].
-	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Labels describing the operation. Only the following labels are allowed:
 	//
 	//   - Labels describing monitored resources as defined in
@@ -161,7 +161,7 @@ type Operation struct {
 	// DO NOT USE. This is an experimental field.
 	Importance Operation_Importance `protobuf:"varint,11,opt,name=importance,proto3,enum=google.api.servicecontrol.v1.Operation_Importance" json:"importance,omitempty"`
 	// Unimplemented.
-	Extensions []*any1.Any `protobuf:"bytes,16,rep,name=extensions,proto3" json:"extensions,omitempty"`
+	Extensions []*anypb.Any `protobuf:"bytes,16,rep,name=extensions,proto3" json:"extensions,omitempty"`
 }
 
 func (x *Operation) Reset() {
@@ -217,14 +217,14 @@ func (x *Operation) GetConsumerId() string {
 	return ""
 }
 
-func (x *Operation) GetStartTime() *timestamp.Timestamp {
+func (x *Operation) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Operation) GetEndTime() *timestamp.Timestamp {
+func (x *Operation) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -259,7 +259,7 @@ func (x *Operation) GetImportance() Operation_Importance {
 	return Operation_LOW
 }
 
-func (x *Operation) GetExtensions() []*any1.Any {
+func (x *Operation) GetExtensions() []*anypb.Any {
 	if x != nil {
 		return x.Extensions
 	}
@@ -360,13 +360,13 @@ func file_google_api_servicecontrol_v1_operation_proto_rawDescGZIP() []byte {
 var file_google_api_servicecontrol_v1_operation_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_api_servicecontrol_v1_operation_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_api_servicecontrol_v1_operation_proto_goTypes = []interface{}{
-	(Operation_Importance)(0),   // 0: google.api.servicecontrol.v1.Operation.Importance
-	(*Operation)(nil),           // 1: google.api.servicecontrol.v1.Operation
-	nil,                         // 2: google.api.servicecontrol.v1.Operation.LabelsEntry
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
-	(*MetricValueSet)(nil),      // 4: google.api.servicecontrol.v1.MetricValueSet
-	(*LogEntry)(nil),            // 5: google.api.servicecontrol.v1.LogEntry
-	(*any1.Any)(nil),            // 6: google.protobuf.Any
+	(Operation_Importance)(0),     // 0: google.api.servicecontrol.v1.Operation.Importance
+	(*Operation)(nil),             // 1: google.api.servicecontrol.v1.Operation
+	nil,                           // 2: google.api.servicecontrol.v1.Operation.LabelsEntry
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(*MetricValueSet)(nil),        // 4: google.api.servicecontrol.v1.MetricValueSet
+	(*LogEntry)(nil),              // 5: google.api.servicecontrol.v1.LogEntry
+	(*anypb.Any)(nil),             // 6: google.protobuf.Any
 }
 var file_google_api_servicecontrol_v1_operation_proto_depIdxs = []int32{
 	3, // 0: google.api.servicecontrol.v1.Operation.start_time:type_name -> google.protobuf.Timestamp
diff --git a/servicecontrol/apiv1/servicecontrolpb/quota_controller.pb.go b/servicecontrol/apiv1/servicecontrolpb/quota_controller.pb.go
index 0c0d2decc41..02fbc7e24c2 100644
--- a/servicecontrol/apiv1/servicecontrolpb/quota_controller.pb.go
+++ b/servicecontrol/apiv1/servicecontrolpb/quota_controller.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicecontrol/v1/quota_controller.proto
 
 package servicecontrolpb
diff --git a/servicecontrol/apiv1/servicecontrolpb/service_controller.pb.go b/servicecontrol/apiv1/servicecontrolpb/service_controller.pb.go
index 914377ee27b..efad8135fbc 100644
--- a/servicecontrol/apiv1/servicecontrolpb/service_controller.pb.go
+++ b/servicecontrol/apiv1/servicecontrolpb/service_controller.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicecontrol/v1/service_controller.proto
 
 package servicecontrolpb
diff --git a/servicecontrol/go.mod b/servicecontrol/go.mod
index 61a594e92c3..330f1b86926 100644
--- a/servicecontrol/go.mod
+++ b/servicecontrol/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/servicecontrol
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/servicecontrol/go.sum b/servicecontrol/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/servicecontrol/go.sum
+++ b/servicecontrol/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/servicedirectory/apiv1/doc.go b/servicedirectory/apiv1/doc.go
index 83f48a49730..1581ec992c7 100644
--- a/servicedirectory/apiv1/doc.go
+++ b/servicedirectory/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &servicedirectorypb.ResolveServiceRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#ResolveServiceRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#ResolveServiceRequest.
 //	}
 //	resp, err := c.ResolveService(ctx, req)
 //	if err != nil {
diff --git a/servicedirectory/apiv1/lookup_client.go b/servicedirectory/apiv1/lookup_client.go
index 5a1cbbab979..36802a4ff96 100644
--- a/servicedirectory/apiv1/lookup_client.go
+++ b/servicedirectory/apiv1/lookup_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	servicedirectorypb "cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	servicedirectorypb "google.golang.org/genproto/googleapis/cloud/servicedirectory/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/servicedirectory/apiv1/lookup_client_example_test.go b/servicedirectory/apiv1/lookup_client_example_test.go
index 10258cfd05d..d33ac680c40 100644
--- a/servicedirectory/apiv1/lookup_client_example_test.go
+++ b/servicedirectory/apiv1/lookup_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	servicedirectory "cloud.google.com/go/servicedirectory/apiv1"
-	servicedirectorypb "google.golang.org/genproto/googleapis/cloud/servicedirectory/v1"
+	servicedirectorypb "cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb"
 )
 
 func ExampleNewLookupClient() {
@@ -55,7 +55,7 @@ func ExampleLookupClient_ResolveService() {
 
 	req := &servicedirectorypb.ResolveServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#ResolveServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#ResolveServiceRequest.
 	}
 	resp, err := c.ResolveService(ctx, req)
 	if err != nil {
diff --git a/servicedirectory/apiv1/registration_client.go b/servicedirectory/apiv1/registration_client.go
index a8eb326560c..82d00de1ae6 100644
--- a/servicedirectory/apiv1/registration_client.go
+++ b/servicedirectory/apiv1/registration_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	servicedirectorypb "cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	servicedirectorypb "google.golang.org/genproto/googleapis/cloud/servicedirectory/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/servicedirectory/apiv1/registration_client_example_test.go b/servicedirectory/apiv1/registration_client_example_test.go
index 9d0780a78a4..41428290397 100644
--- a/servicedirectory/apiv1/registration_client_example_test.go
+++ b/servicedirectory/apiv1/registration_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	servicedirectory "cloud.google.com/go/servicedirectory/apiv1"
+	servicedirectorypb "cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb"
 	"google.golang.org/api/iterator"
-	servicedirectorypb "google.golang.org/genproto/googleapis/cloud/servicedirectory/v1"
 	iampb "google.golang.org/genproto/googleapis/iam/v1"
 )
 
@@ -57,7 +57,7 @@ func ExampleRegistrationClient_CreateNamespace() {
 
 	req := &servicedirectorypb.CreateNamespaceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#CreateNamespaceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#CreateNamespaceRequest.
 	}
 	resp, err := c.CreateNamespace(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleRegistrationClient_ListNamespaces() {
 
 	req := &servicedirectorypb.ListNamespacesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#ListNamespacesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#ListNamespacesRequest.
 	}
 	it := c.ListNamespaces(ctx, req)
 	for {
@@ -113,7 +113,7 @@ func ExampleRegistrationClient_GetNamespace() {
 
 	req := &servicedirectorypb.GetNamespaceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#GetNamespaceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#GetNamespaceRequest.
 	}
 	resp, err := c.GetNamespace(ctx, req)
 	if err != nil {
@@ -138,7 +138,7 @@ func ExampleRegistrationClient_UpdateNamespace() {
 
 	req := &servicedirectorypb.UpdateNamespaceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#UpdateNamespaceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#UpdateNamespaceRequest.
 	}
 	resp, err := c.UpdateNamespace(ctx, req)
 	if err != nil {
@@ -163,7 +163,7 @@ func ExampleRegistrationClient_DeleteNamespace() {
 
 	req := &servicedirectorypb.DeleteNamespaceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#DeleteNamespaceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#DeleteNamespaceRequest.
 	}
 	err = c.DeleteNamespace(ctx, req)
 	if err != nil {
@@ -186,7 +186,7 @@ func ExampleRegistrationClient_CreateService() {
 
 	req := &servicedirectorypb.CreateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#CreateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#CreateServiceRequest.
 	}
 	resp, err := c.CreateService(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExampleRegistrationClient_ListServices() {
 
 	req := &servicedirectorypb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
@@ -242,7 +242,7 @@ func ExampleRegistrationClient_GetService() {
 
 	req := &servicedirectorypb.GetServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#GetServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#GetServiceRequest.
 	}
 	resp, err := c.GetService(ctx, req)
 	if err != nil {
@@ -267,7 +267,7 @@ func ExampleRegistrationClient_UpdateService() {
 
 	req := &servicedirectorypb.UpdateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#UpdateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#UpdateServiceRequest.
 	}
 	resp, err := c.UpdateService(ctx, req)
 	if err != nil {
@@ -292,7 +292,7 @@ func ExampleRegistrationClient_DeleteService() {
 
 	req := &servicedirectorypb.DeleteServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#DeleteServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#DeleteServiceRequest.
 	}
 	err = c.DeleteService(ctx, req)
 	if err != nil {
@@ -315,7 +315,7 @@ func ExampleRegistrationClient_CreateEndpoint() {
 
 	req := &servicedirectorypb.CreateEndpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#CreateEndpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#CreateEndpointRequest.
 	}
 	resp, err := c.CreateEndpoint(ctx, req)
 	if err != nil {
@@ -340,7 +340,7 @@ func ExampleRegistrationClient_ListEndpoints() {
 
 	req := &servicedirectorypb.ListEndpointsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#ListEndpointsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#ListEndpointsRequest.
 	}
 	it := c.ListEndpoints(ctx, req)
 	for {
@@ -371,7 +371,7 @@ func ExampleRegistrationClient_GetEndpoint() {
 
 	req := &servicedirectorypb.GetEndpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#GetEndpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#GetEndpointRequest.
 	}
 	resp, err := c.GetEndpoint(ctx, req)
 	if err != nil {
@@ -396,7 +396,7 @@ func ExampleRegistrationClient_UpdateEndpoint() {
 
 	req := &servicedirectorypb.UpdateEndpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#UpdateEndpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#UpdateEndpointRequest.
 	}
 	resp, err := c.UpdateEndpoint(ctx, req)
 	if err != nil {
@@ -421,7 +421,7 @@ func ExampleRegistrationClient_DeleteEndpoint() {
 
 	req := &servicedirectorypb.DeleteEndpointRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/servicedirectory/v1#DeleteEndpointRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicedirectory/apiv1/servicedirectorypb#DeleteEndpointRequest.
 	}
 	err = c.DeleteEndpoint(ctx, req)
 	if err != nil {
diff --git a/servicedirectory/apiv1/servicedirectorypb/endpoint.pb.go b/servicedirectory/apiv1/servicedirectorypb/endpoint.pb.go
index 1907178c75d..71b27118eac 100644
--- a/servicedirectory/apiv1/servicedirectorypb/endpoint.pb.go
+++ b/servicedirectory/apiv1/servicedirectorypb/endpoint.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/servicedirectory/v1/endpoint.proto
 
 package servicedirectorypb
diff --git a/servicedirectory/apiv1/servicedirectorypb/lookup_service.pb.go b/servicedirectory/apiv1/servicedirectorypb/lookup_service.pb.go
index 18d54bc83b7..23ec7caf9a3 100644
--- a/servicedirectory/apiv1/servicedirectorypb/lookup_service.pb.go
+++ b/servicedirectory/apiv1/servicedirectorypb/lookup_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/servicedirectory/v1/lookup_service.proto
 
 package servicedirectorypb
diff --git a/servicedirectory/apiv1/servicedirectorypb/namespace.pb.go b/servicedirectory/apiv1/servicedirectorypb/namespace.pb.go
index d772e081163..b38a427e5b4 100644
--- a/servicedirectory/apiv1/servicedirectorypb/namespace.pb.go
+++ b/servicedirectory/apiv1/servicedirectorypb/namespace.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/servicedirectory/v1/namespace.proto
 
 package servicedirectorypb
diff --git a/servicedirectory/apiv1/servicedirectorypb/registration_service.pb.go b/servicedirectory/apiv1/servicedirectorypb/registration_service.pb.go
index c179a6bf03a..caf3f3e6f15 100644
--- a/servicedirectory/apiv1/servicedirectorypb/registration_service.pb.go
+++ b/servicedirectory/apiv1/servicedirectorypb/registration_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/servicedirectory/v1/registration_service.proto
 
 package servicedirectorypb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -356,7 +356,7 @@ type UpdateNamespaceRequest struct {
 	// Required. The updated namespace.
 	Namespace *Namespace `protobuf:"bytes,1,opt,name=namespace,proto3" json:"namespace,omitempty"`
 	// Required. List of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateNamespaceRequest) Reset() {
@@ -398,7 +398,7 @@ func (x *UpdateNamespaceRequest) GetNamespace() *Namespace {
 	return nil
 }
 
-func (x *UpdateNamespaceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateNamespaceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -761,7 +761,7 @@ type UpdateServiceRequest struct {
 	// Required. The updated service.
 	Service *Service `protobuf:"bytes,1,opt,name=service,proto3" json:"service,omitempty"`
 	// Required. List of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateServiceRequest) Reset() {
@@ -803,7 +803,7 @@ func (x *UpdateServiceRequest) GetService() *Service {
 	return nil
 }
 
-func (x *UpdateServiceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateServiceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1168,7 +1168,7 @@ type UpdateEndpointRequest struct {
 	// Required. The updated endpoint.
 	Endpoint *Endpoint `protobuf:"bytes,1,opt,name=endpoint,proto3" json:"endpoint,omitempty"`
 	// Required. List of fields to be updated in this request.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateEndpointRequest) Reset() {
@@ -1210,7 +1210,7 @@ func (x *UpdateEndpointRequest) GetEndpoint() *Endpoint {
 	return nil
 }
 
-func (x *UpdateEndpointRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateEndpointRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1774,13 +1774,13 @@ var file_google_cloud_servicedirectory_v1_registration_service_proto_goTypes = [
 	(*UpdateEndpointRequest)(nil),         // 16: google.cloud.servicedirectory.v1.UpdateEndpointRequest
 	(*DeleteEndpointRequest)(nil),         // 17: google.cloud.servicedirectory.v1.DeleteEndpointRequest
 	(*Namespace)(nil),                     // 18: google.cloud.servicedirectory.v1.Namespace
-	(*field_mask.FieldMask)(nil),          // 19: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),         // 19: google.protobuf.FieldMask
 	(*Service)(nil),                       // 20: google.cloud.servicedirectory.v1.Service
 	(*Endpoint)(nil),                      // 21: google.cloud.servicedirectory.v1.Endpoint
 	(*v1.GetIamPolicyRequest)(nil),        // 22: google.iam.v1.GetIamPolicyRequest
 	(*v1.SetIamPolicyRequest)(nil),        // 23: google.iam.v1.SetIamPolicyRequest
 	(*v1.TestIamPermissionsRequest)(nil),  // 24: google.iam.v1.TestIamPermissionsRequest
-	(*empty.Empty)(nil),                   // 25: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                 // 25: google.protobuf.Empty
 	(*v1.Policy)(nil),                     // 26: google.iam.v1.Policy
 	(*v1.TestIamPermissionsResponse)(nil), // 27: google.iam.v1.TestIamPermissionsResponse
 }
@@ -2108,7 +2108,7 @@ type RegistrationServiceClient interface {
 	UpdateNamespace(ctx context.Context, in *UpdateNamespaceRequest, opts ...grpc.CallOption) (*Namespace, error)
 	// Deletes a namespace. This also deletes all services and endpoints in
 	// the namespace.
-	DeleteNamespace(ctx context.Context, in *DeleteNamespaceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteNamespace(ctx context.Context, in *DeleteNamespaceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates a service, and returns the new Service.
 	CreateService(ctx context.Context, in *CreateServiceRequest, opts ...grpc.CallOption) (*Service, error)
 	// Lists all services belonging to a namespace.
@@ -2119,7 +2119,7 @@ type RegistrationServiceClient interface {
 	UpdateService(ctx context.Context, in *UpdateServiceRequest, opts ...grpc.CallOption) (*Service, error)
 	// Deletes a service. This also deletes all endpoints associated with
 	// the service.
-	DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates a endpoint, and returns the new Endpoint.
 	CreateEndpoint(ctx context.Context, in *CreateEndpointRequest, opts ...grpc.CallOption) (*Endpoint, error)
 	// Lists all endpoints.
@@ -2129,7 +2129,7 @@ type RegistrationServiceClient interface {
 	// Updates a endpoint.
 	UpdateEndpoint(ctx context.Context, in *UpdateEndpointRequest, opts ...grpc.CallOption) (*Endpoint, error)
 	// Deletes a endpoint.
-	DeleteEndpoint(ctx context.Context, in *DeleteEndpointRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEndpoint(ctx context.Context, in *DeleteEndpointRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets the IAM Policy for a resource (namespace or service only).
 	GetIamPolicy(ctx context.Context, in *v1.GetIamPolicyRequest, opts ...grpc.CallOption) (*v1.Policy, error)
 	// Sets the IAM Policy for a resource (namespace or service only).
@@ -2182,8 +2182,8 @@ func (c *registrationServiceClient) UpdateNamespace(ctx context.Context, in *Upd
 	return out, nil
 }
 
-func (c *registrationServiceClient) DeleteNamespace(ctx context.Context, in *DeleteNamespaceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *registrationServiceClient) DeleteNamespace(ctx context.Context, in *DeleteNamespaceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.servicedirectory.v1.RegistrationService/DeleteNamespace", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2227,8 +2227,8 @@ func (c *registrationServiceClient) UpdateService(ctx context.Context, in *Updat
 	return out, nil
 }
 
-func (c *registrationServiceClient) DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *registrationServiceClient) DeleteService(ctx context.Context, in *DeleteServiceRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.servicedirectory.v1.RegistrationService/DeleteService", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2272,8 +2272,8 @@ func (c *registrationServiceClient) UpdateEndpoint(ctx context.Context, in *Upda
 	return out, nil
 }
 
-func (c *registrationServiceClient) DeleteEndpoint(ctx context.Context, in *DeleteEndpointRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *registrationServiceClient) DeleteEndpoint(ctx context.Context, in *DeleteEndpointRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.servicedirectory.v1.RegistrationService/DeleteEndpoint", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2320,7 +2320,7 @@ type RegistrationServiceServer interface {
 	UpdateNamespace(context.Context, *UpdateNamespaceRequest) (*Namespace, error)
 	// Deletes a namespace. This also deletes all services and endpoints in
 	// the namespace.
-	DeleteNamespace(context.Context, *DeleteNamespaceRequest) (*empty.Empty, error)
+	DeleteNamespace(context.Context, *DeleteNamespaceRequest) (*emptypb.Empty, error)
 	// Creates a service, and returns the new Service.
 	CreateService(context.Context, *CreateServiceRequest) (*Service, error)
 	// Lists all services belonging to a namespace.
@@ -2331,7 +2331,7 @@ type RegistrationServiceServer interface {
 	UpdateService(context.Context, *UpdateServiceRequest) (*Service, error)
 	// Deletes a service. This also deletes all endpoints associated with
 	// the service.
-	DeleteService(context.Context, *DeleteServiceRequest) (*empty.Empty, error)
+	DeleteService(context.Context, *DeleteServiceRequest) (*emptypb.Empty, error)
 	// Creates a endpoint, and returns the new Endpoint.
 	CreateEndpoint(context.Context, *CreateEndpointRequest) (*Endpoint, error)
 	// Lists all endpoints.
@@ -2341,7 +2341,7 @@ type RegistrationServiceServer interface {
 	// Updates a endpoint.
 	UpdateEndpoint(context.Context, *UpdateEndpointRequest) (*Endpoint, error)
 	// Deletes a endpoint.
-	DeleteEndpoint(context.Context, *DeleteEndpointRequest) (*empty.Empty, error)
+	DeleteEndpoint(context.Context, *DeleteEndpointRequest) (*emptypb.Empty, error)
 	// Gets the IAM Policy for a resource (namespace or service only).
 	GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error)
 	// Sets the IAM Policy for a resource (namespace or service only).
@@ -2366,7 +2366,7 @@ func (*UnimplementedRegistrationServiceServer) GetNamespace(context.Context, *Ge
 func (*UnimplementedRegistrationServiceServer) UpdateNamespace(context.Context, *UpdateNamespaceRequest) (*Namespace, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateNamespace not implemented")
 }
-func (*UnimplementedRegistrationServiceServer) DeleteNamespace(context.Context, *DeleteNamespaceRequest) (*empty.Empty, error) {
+func (*UnimplementedRegistrationServiceServer) DeleteNamespace(context.Context, *DeleteNamespaceRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteNamespace not implemented")
 }
 func (*UnimplementedRegistrationServiceServer) CreateService(context.Context, *CreateServiceRequest) (*Service, error) {
@@ -2381,7 +2381,7 @@ func (*UnimplementedRegistrationServiceServer) GetService(context.Context, *GetS
 func (*UnimplementedRegistrationServiceServer) UpdateService(context.Context, *UpdateServiceRequest) (*Service, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateService not implemented")
 }
-func (*UnimplementedRegistrationServiceServer) DeleteService(context.Context, *DeleteServiceRequest) (*empty.Empty, error) {
+func (*UnimplementedRegistrationServiceServer) DeleteService(context.Context, *DeleteServiceRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteService not implemented")
 }
 func (*UnimplementedRegistrationServiceServer) CreateEndpoint(context.Context, *CreateEndpointRequest) (*Endpoint, error) {
@@ -2396,7 +2396,7 @@ func (*UnimplementedRegistrationServiceServer) GetEndpoint(context.Context, *Get
 func (*UnimplementedRegistrationServiceServer) UpdateEndpoint(context.Context, *UpdateEndpointRequest) (*Endpoint, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateEndpoint not implemented")
 }
-func (*UnimplementedRegistrationServiceServer) DeleteEndpoint(context.Context, *DeleteEndpointRequest) (*empty.Empty, error) {
+func (*UnimplementedRegistrationServiceServer) DeleteEndpoint(context.Context, *DeleteEndpointRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEndpoint not implemented")
 }
 func (*UnimplementedRegistrationServiceServer) GetIamPolicy(context.Context, *v1.GetIamPolicyRequest) (*v1.Policy, error) {
diff --git a/servicedirectory/apiv1/servicedirectorypb/service.pb.go b/servicedirectory/apiv1/servicedirectorypb/service.pb.go
index 10684ec2c1a..a91a41a790b 100644
--- a/servicedirectory/apiv1/servicedirectorypb/service.pb.go
+++ b/servicedirectory/apiv1/servicedirectorypb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/servicedirectory/v1/service.proto
 
 package servicedirectorypb
diff --git a/servicedirectory/go.mod b/servicedirectory/go.mod
index e19f9c65790..6137d3b1e16 100644
--- a/servicedirectory/go.mod
+++ b/servicedirectory/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/servicedirectory/go.sum b/servicedirectory/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/servicedirectory/go.sum
+++ b/servicedirectory/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/servicemanagement/aliasshim/aliasshim.go b/servicemanagement/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/servicemanagement/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/servicemanagement/apiv1/doc.go b/servicemanagement/apiv1/doc.go
index 69c53927b6c..1c5ed7c0e6c 100644
--- a/servicemanagement/apiv1/doc.go
+++ b/servicemanagement/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &servicemanagementpb.ListServicesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#ListServicesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#ListServicesRequest.
 //	}
 //	it := c.ListServices(ctx, req)
 //	for {
diff --git a/servicemanagement/apiv1/service_manager_client.go b/servicemanagement/apiv1/service_manager_client.go
index 0dd2a7ba5a9..41162f54843 100644
--- a/servicemanagement/apiv1/service_manager_client.go
+++ b/servicemanagement/apiv1/service_manager_client.go
@@ -25,13 +25,13 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	servicemanagementpb "cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	serviceconfigpb "google.golang.org/genproto/googleapis/api/serviceconfig"
-	servicemanagementpb "google.golang.org/genproto/googleapis/api/servicemanagement/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/servicemanagement/apiv1/service_manager_client_example_test.go b/servicemanagement/apiv1/service_manager_client_example_test.go
index 5cbc8c99321..74273298071 100644
--- a/servicemanagement/apiv1/service_manager_client_example_test.go
+++ b/servicemanagement/apiv1/service_manager_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	servicemanagement "cloud.google.com/go/servicemanagement/apiv1"
+	servicemanagementpb "cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb"
 	"google.golang.org/api/iterator"
-	servicemanagementpb "google.golang.org/genproto/googleapis/api/servicemanagement/v1"
 )
 
 func ExampleNewServiceManagerClient() {
@@ -56,7 +56,7 @@ func ExampleServiceManagerClient_ListServices() {
 
 	req := &servicemanagementpb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleServiceManagerClient_GetService() {
 
 	req := &servicemanagementpb.GetServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#GetServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#GetServiceRequest.
 	}
 	resp, err := c.GetService(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleServiceManagerClient_CreateService() {
 
 	req := &servicemanagementpb.CreateServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#CreateServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#CreateServiceRequest.
 	}
 	op, err := c.CreateService(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleServiceManagerClient_DeleteService() {
 
 	req := &servicemanagementpb.DeleteServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#DeleteServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#DeleteServiceRequest.
 	}
 	op, err := c.DeleteService(ctx, req)
 	if err != nil {
@@ -170,7 +170,7 @@ func ExampleServiceManagerClient_UndeleteService() {
 
 	req := &servicemanagementpb.UndeleteServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#UndeleteServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#UndeleteServiceRequest.
 	}
 	op, err := c.UndeleteService(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleServiceManagerClient_ListServiceConfigs() {
 
 	req := &servicemanagementpb.ListServiceConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#ListServiceConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#ListServiceConfigsRequest.
 	}
 	it := c.ListServiceConfigs(ctx, req)
 	for {
@@ -231,7 +231,7 @@ func ExampleServiceManagerClient_GetServiceConfig() {
 
 	req := &servicemanagementpb.GetServiceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#GetServiceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#GetServiceConfigRequest.
 	}
 	resp, err := c.GetServiceConfig(ctx, req)
 	if err != nil {
@@ -256,7 +256,7 @@ func ExampleServiceManagerClient_CreateServiceConfig() {
 
 	req := &servicemanagementpb.CreateServiceConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#CreateServiceConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#CreateServiceConfigRequest.
 	}
 	resp, err := c.CreateServiceConfig(ctx, req)
 	if err != nil {
@@ -281,7 +281,7 @@ func ExampleServiceManagerClient_SubmitConfigSource() {
 
 	req := &servicemanagementpb.SubmitConfigSourceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#SubmitConfigSourceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#SubmitConfigSourceRequest.
 	}
 	op, err := c.SubmitConfigSource(ctx, req)
 	if err != nil {
@@ -311,7 +311,7 @@ func ExampleServiceManagerClient_ListServiceRollouts() {
 
 	req := &servicemanagementpb.ListServiceRolloutsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#ListServiceRolloutsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#ListServiceRolloutsRequest.
 	}
 	it := c.ListServiceRollouts(ctx, req)
 	for {
@@ -342,7 +342,7 @@ func ExampleServiceManagerClient_GetServiceRollout() {
 
 	req := &servicemanagementpb.GetServiceRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#GetServiceRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#GetServiceRolloutRequest.
 	}
 	resp, err := c.GetServiceRollout(ctx, req)
 	if err != nil {
@@ -367,7 +367,7 @@ func ExampleServiceManagerClient_CreateServiceRollout() {
 
 	req := &servicemanagementpb.CreateServiceRolloutRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#CreateServiceRolloutRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#CreateServiceRolloutRequest.
 	}
 	op, err := c.CreateServiceRollout(ctx, req)
 	if err != nil {
@@ -397,7 +397,7 @@ func ExampleServiceManagerClient_GenerateConfigReport() {
 
 	req := &servicemanagementpb.GenerateConfigReportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/servicemanagement/v1#GenerateConfigReportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/servicemanagement/apiv1/servicemanagementpb#GenerateConfigReportRequest.
 	}
 	resp, err := c.GenerateConfigReport(ctx, req)
 	if err != nil {
diff --git a/servicemanagement/apiv1/servicemanagementpb/resources.pb.go b/servicemanagement/apiv1/servicemanagementpb/resources.pb.go
index 59814679ba6..a305859e972 100644
--- a/servicemanagement/apiv1/servicemanagementpb/resources.pb.go
+++ b/servicemanagement/apiv1/servicemanagementpb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicemanagement/v1/resources.proto
 
 package servicemanagementpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	configchange "google.golang.org/genproto/googleapis/api/configchange"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -373,7 +373,7 @@ type OperationMetadata struct {
 	// Percentage of completion of this operation, ranging from 0 to 100.
 	ProgressPercentage int32 `protobuf:"varint,3,opt,name=progress_percentage,json=progressPercentage,proto3" json:"progress_percentage,omitempty"`
 	// The start time of the operation.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 }
 
 func (x *OperationMetadata) Reset() {
@@ -429,7 +429,7 @@ func (x *OperationMetadata) GetProgressPercentage() int32 {
 	return 0
 }
 
-func (x *OperationMetadata) GetStartTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -757,7 +757,7 @@ type Rollout struct {
 	// An example of the generated rollout_id is '2016-02-16r1'
 	RolloutId string `protobuf:"bytes,1,opt,name=rollout_id,json=rolloutId,proto3" json:"rollout_id,omitempty"`
 	// Creation time of the rollout. Readonly.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The user who created the Rollout. Readonly.
 	CreatedBy string `protobuf:"bytes,3,opt,name=created_by,json=createdBy,proto3" json:"created_by,omitempty"`
 	// The status of this rollout. Readonly. In case of a failed rollout,
@@ -816,7 +816,7 @@ func (x *Rollout) GetRolloutId() string {
 	return ""
 }
 
-func (x *Rollout) GetCreateTime() *timestamp.Timestamp {
+func (x *Rollout) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1263,7 +1263,7 @@ var file_google_api_servicemanagement_v1_resources_proto_goTypes = []interface{}
 	(*Rollout_TrafficPercentStrategy)(nil), // 13: google.api.servicemanagement.v1.Rollout.TrafficPercentStrategy
 	(*Rollout_DeleteServiceStrategy)(nil),  // 14: google.api.servicemanagement.v1.Rollout.DeleteServiceStrategy
 	nil,                                    // 15: google.api.servicemanagement.v1.Rollout.TrafficPercentStrategy.PercentagesEntry
-	(*timestamp.Timestamp)(nil),            // 16: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 16: google.protobuf.Timestamp
 	(*configchange.ConfigChange)(nil),      // 17: google.api.ConfigChange
 }
 var file_google_api_servicemanagement_v1_resources_proto_depIdxs = []int32{
diff --git a/servicemanagement/apiv1/servicemanagementpb/servicemanager.pb.go b/servicemanagement/apiv1/servicemanagementpb/servicemanager.pb.go
index 3215bdb05cb..fb097ced4c8 100644
--- a/servicemanagement/apiv1/servicemanagementpb/servicemanager.pb.go
+++ b/servicemanagement/apiv1/servicemanagementpb/servicemanager.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/servicemanagement/v1/servicemanager.proto
 
 package servicemanagementpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	any1 "github.com/golang/protobuf/ptypes/any"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	serviceconfig "google.golang.org/genproto/googleapis/api/serviceconfig"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
@@ -34,6 +33,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
 )
 
 const (
@@ -1144,13 +1144,13 @@ type GenerateConfigReportRequest struct {
 	// [google.api.servicemanagement.v1.ConfigRef][google.api.servicemanagement.v1.ConfigRef],
 	// [google.api.servicemanagement.v1.ConfigSource][google.api.servicemanagement.v1.ConfigSource],
 	// and [google.api.Service][google.api.Service]
-	NewConfig *any1.Any `protobuf:"bytes,1,opt,name=new_config,json=newConfig,proto3" json:"new_config,omitempty"`
+	NewConfig *anypb.Any `protobuf:"bytes,1,opt,name=new_config,json=newConfig,proto3" json:"new_config,omitempty"`
 	// Optional. Service configuration against which the comparison will be done.
 	// For this version of API, the supported types are
 	// [google.api.servicemanagement.v1.ConfigRef][google.api.servicemanagement.v1.ConfigRef],
 	// [google.api.servicemanagement.v1.ConfigSource][google.api.servicemanagement.v1.ConfigSource],
 	// and [google.api.Service][google.api.Service]
-	OldConfig *any1.Any `protobuf:"bytes,2,opt,name=old_config,json=oldConfig,proto3" json:"old_config,omitempty"`
+	OldConfig *anypb.Any `protobuf:"bytes,2,opt,name=old_config,json=oldConfig,proto3" json:"old_config,omitempty"`
 }
 
 func (x *GenerateConfigReportRequest) Reset() {
@@ -1185,14 +1185,14 @@ func (*GenerateConfigReportRequest) Descriptor() ([]byte, []int) {
 	return file_google_api_servicemanagement_v1_servicemanager_proto_rawDescGZIP(), []int{17}
 }
 
-func (x *GenerateConfigReportRequest) GetNewConfig() *any1.Any {
+func (x *GenerateConfigReportRequest) GetNewConfig() *anypb.Any {
 	if x != nil {
 		return x.NewConfig
 	}
 	return nil
 }
 
-func (x *GenerateConfigReportRequest) GetOldConfig() *any1.Any {
+func (x *GenerateConfigReportRequest) GetOldConfig() *anypb.Any {
 	if x != nil {
 		return x.OldConfig
 	}
@@ -1724,7 +1724,7 @@ var file_google_api_servicemanagement_v1_servicemanager_proto_goTypes = []interf
 	(*serviceconfig.Service)(nil),           // 21: google.api.Service
 	(*ConfigSource)(nil),                    // 22: google.api.servicemanagement.v1.ConfigSource
 	(*Rollout)(nil),                         // 23: google.api.servicemanagement.v1.Rollout
-	(*any1.Any)(nil),                        // 24: google.protobuf.Any
+	(*anypb.Any)(nil),                       // 24: google.protobuf.Any
 	(*ChangeReport)(nil),                    // 25: google.api.servicemanagement.v1.ChangeReport
 	(*Diagnostic)(nil),                      // 26: google.api.servicemanagement.v1.Diagnostic
 	(*longrunning.Operation)(nil),           // 27: google.longrunning.Operation
diff --git a/servicemanagement/go.mod b/servicemanagement/go.mod
index 3bb963f58a1..ad2193dfb72 100644
--- a/servicemanagement/go.mod
+++ b/servicemanagement/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/servicemanagement
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/servicemanagement/go.sum b/servicemanagement/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/servicemanagement/go.sum
+++ b/servicemanagement/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/serviceusage/aliasshim/aliasshim.go b/serviceusage/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/serviceusage/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/serviceusage/apiv1/doc.go b/serviceusage/apiv1/doc.go
index c438c87086f..4d070096f30 100644
--- a/serviceusage/apiv1/doc.go
+++ b/serviceusage/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &serviceusagepb.EnableServiceRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/serviceusage/v1#EnableServiceRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/serviceusage/apiv1/serviceusagepb#EnableServiceRequest.
 //	}
 //	op, err := c.EnableService(ctx, req)
 //	if err != nil {
diff --git a/serviceusage/apiv1/service_usage_client.go b/serviceusage/apiv1/service_usage_client.go
index 44a95fae0bd..5470aac8f6d 100644
--- a/serviceusage/apiv1/service_usage_client.go
+++ b/serviceusage/apiv1/service_usage_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	serviceusagepb "cloud.google.com/go/serviceusage/apiv1/serviceusagepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	serviceusagepb "google.golang.org/genproto/googleapis/api/serviceusage/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/serviceusage/apiv1/service_usage_client_example_test.go b/serviceusage/apiv1/service_usage_client_example_test.go
index fd76fd3a4ac..306a0e2c5b3 100644
--- a/serviceusage/apiv1/service_usage_client_example_test.go
+++ b/serviceusage/apiv1/service_usage_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	serviceusage "cloud.google.com/go/serviceusage/apiv1"
+	serviceusagepb "cloud.google.com/go/serviceusage/apiv1/serviceusagepb"
 	"google.golang.org/api/iterator"
-	serviceusagepb "google.golang.org/genproto/googleapis/api/serviceusage/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_EnableService() {
 
 	req := &serviceusagepb.EnableServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/serviceusage/v1#EnableServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/serviceusage/apiv1/serviceusagepb#EnableServiceRequest.
 	}
 	op, err := c.EnableService(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleClient_DisableService() {
 
 	req := &serviceusagepb.DisableServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/serviceusage/v1#DisableServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/serviceusage/apiv1/serviceusagepb#DisableServiceRequest.
 	}
 	op, err := c.DisableService(ctx, req)
 	if err != nil {
@@ -116,7 +116,7 @@ func ExampleClient_GetService() {
 
 	req := &serviceusagepb.GetServiceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/serviceusage/v1#GetServiceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/serviceusage/apiv1/serviceusagepb#GetServiceRequest.
 	}
 	resp, err := c.GetService(ctx, req)
 	if err != nil {
@@ -141,7 +141,7 @@ func ExampleClient_ListServices() {
 
 	req := &serviceusagepb.ListServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/serviceusage/v1#ListServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/serviceusage/apiv1/serviceusagepb#ListServicesRequest.
 	}
 	it := c.ListServices(ctx, req)
 	for {
@@ -172,7 +172,7 @@ func ExampleClient_BatchEnableServices() {
 
 	req := &serviceusagepb.BatchEnableServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/serviceusage/v1#BatchEnableServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/serviceusage/apiv1/serviceusagepb#BatchEnableServicesRequest.
 	}
 	op, err := c.BatchEnableServices(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleClient_BatchGetServices() {
 
 	req := &serviceusagepb.BatchGetServicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/api/serviceusage/v1#BatchGetServicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/serviceusage/apiv1/serviceusagepb#BatchGetServicesRequest.
 	}
 	resp, err := c.BatchGetServices(ctx, req)
 	if err != nil {
diff --git a/serviceusage/apiv1/serviceusagepb/resources.pb.go b/serviceusage/apiv1/serviceusagepb/resources.pb.go
index 6db497480cd..0e3f48f238d 100644
--- a/serviceusage/apiv1/serviceusagepb/resources.pb.go
+++ b/serviceusage/apiv1/serviceusagepb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/serviceusage/v1/resources.proto
 
 package serviceusagepb
@@ -26,9 +26,9 @@ import (
 
 	monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
 	serviceconfig "google.golang.org/genproto/googleapis/api/serviceconfig"
-	api "google.golang.org/genproto/protobuf/api"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	apipb "google.golang.org/protobuf/types/known/apipb"
 )
 
 const (
@@ -194,7 +194,7 @@ type ServiceConfig struct {
 	Title string `protobuf:"bytes,2,opt,name=title,proto3" json:"title,omitempty"`
 	// A list of API interfaces exported by this service. Contains only the names,
 	// versions, and method names of the interfaces.
-	Apis []*api.Api `protobuf:"bytes,3,rep,name=apis,proto3" json:"apis,omitempty"`
+	Apis []*apipb.Api `protobuf:"bytes,3,rep,name=apis,proto3" json:"apis,omitempty"`
 	// Additional API documentation. Contains only the summary and the
 	// documentation URL.
 	Documentation *serviceconfig.Documentation `protobuf:"bytes,6,opt,name=documentation,proto3" json:"documentation,omitempty"`
@@ -261,7 +261,7 @@ func (x *ServiceConfig) GetTitle() string {
 	return ""
 }
 
-func (x *ServiceConfig) GetApis() []*api.Api {
+func (x *ServiceConfig) GetApis() []*apipb.Api {
 	if x != nil {
 		return x.Apis
 	}
@@ -475,7 +475,7 @@ var file_google_api_serviceusage_v1_resources_proto_goTypes = []interface{}{
 	(*Service)(nil),                                  // 1: google.api.serviceusage.v1.Service
 	(*ServiceConfig)(nil),                            // 2: google.api.serviceusage.v1.ServiceConfig
 	(*OperationMetadata)(nil),                        // 3: google.api.serviceusage.v1.OperationMetadata
-	(*api.Api)(nil),                                  // 4: google.protobuf.Api
+	(*apipb.Api)(nil),                                // 4: google.protobuf.Api
 	(*serviceconfig.Documentation)(nil),              // 5: google.api.Documentation
 	(*serviceconfig.Quota)(nil),                      // 6: google.api.Quota
 	(*serviceconfig.Authentication)(nil),             // 7: google.api.Authentication
diff --git a/serviceusage/apiv1/serviceusagepb/serviceusage.pb.go b/serviceusage/apiv1/serviceusagepb/serviceusage.pb.go
index 986b46a2f33..4d244fc00ad 100644
--- a/serviceusage/apiv1/serviceusagepb/serviceusage.pb.go
+++ b/serviceusage/apiv1/serviceusagepb/serviceusage.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/api/serviceusage/v1/serviceusage.proto
 
 package serviceusagepb
diff --git a/serviceusage/go.mod b/serviceusage/go.mod
index 8f12e5d1820..ddf086a0a32 100644
--- a/serviceusage/go.mod
+++ b/serviceusage/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/serviceusage
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/serviceusage/go.sum b/serviceusage/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/serviceusage/go.sum
+++ b/serviceusage/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/shell/aliasshim/aliasshim.go b/shell/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/shell/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/shell/apiv1/cloud_shell_client.go b/shell/apiv1/cloud_shell_client.go
index d25885933f6..4540d93c53c 100644
--- a/shell/apiv1/cloud_shell_client.go
+++ b/shell/apiv1/cloud_shell_client.go
@@ -25,11 +25,11 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	shellpb "cloud.google.com/go/shell/apiv1/shellpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	shellpb "google.golang.org/genproto/googleapis/cloud/shell/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/shell/apiv1/cloud_shell_client_example_test.go b/shell/apiv1/cloud_shell_client_example_test.go
index 62b2bec5613..8dcae4ea4ed 100644
--- a/shell/apiv1/cloud_shell_client_example_test.go
+++ b/shell/apiv1/cloud_shell_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	shell "cloud.google.com/go/shell/apiv1"
-	shellpb "google.golang.org/genproto/googleapis/cloud/shell/v1"
+	shellpb "cloud.google.com/go/shell/apiv1/shellpb"
 )
 
 func ExampleNewCloudShellClient() {
@@ -55,7 +55,7 @@ func ExampleCloudShellClient_GetEnvironment() {
 
 	req := &shellpb.GetEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/shell/v1#GetEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/shell/apiv1/shellpb#GetEnvironmentRequest.
 	}
 	resp, err := c.GetEnvironment(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleCloudShellClient_StartEnvironment() {
 
 	req := &shellpb.StartEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/shell/v1#StartEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/shell/apiv1/shellpb#StartEnvironmentRequest.
 	}
 	op, err := c.StartEnvironment(ctx, req)
 	if err != nil {
@@ -110,7 +110,7 @@ func ExampleCloudShellClient_AuthorizeEnvironment() {
 
 	req := &shellpb.AuthorizeEnvironmentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/shell/v1#AuthorizeEnvironmentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/shell/apiv1/shellpb#AuthorizeEnvironmentRequest.
 	}
 	op, err := c.AuthorizeEnvironment(ctx, req)
 	if err != nil {
@@ -140,7 +140,7 @@ func ExampleCloudShellClient_AddPublicKey() {
 
 	req := &shellpb.AddPublicKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/shell/v1#AddPublicKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/shell/apiv1/shellpb#AddPublicKeyRequest.
 	}
 	op, err := c.AddPublicKey(ctx, req)
 	if err != nil {
@@ -170,7 +170,7 @@ func ExampleCloudShellClient_RemovePublicKey() {
 
 	req := &shellpb.RemovePublicKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/shell/v1#RemovePublicKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/shell/apiv1/shellpb#RemovePublicKeyRequest.
 	}
 	op, err := c.RemovePublicKey(ctx, req)
 	if err != nil {
diff --git a/shell/apiv1/doc.go b/shell/apiv1/doc.go
index 825284671b0..1806e8ad94a 100644
--- a/shell/apiv1/doc.go
+++ b/shell/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &shellpb.GetEnvironmentRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/shell/v1#GetEnvironmentRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/shell/apiv1/shellpb#GetEnvironmentRequest.
 //	}
 //	resp, err := c.GetEnvironment(ctx, req)
 //	if err != nil {
diff --git a/shell/apiv1/shellpb/cloudshell.pb.go b/shell/apiv1/shellpb/cloudshell.pb.go
index 17ffc00d7f2..27328b71a8f 100644
--- a/shell/apiv1/shellpb/cloudshell.pb.go
+++ b/shell/apiv1/shellpb/cloudshell.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/shell/v1/cloudshell.proto
 
 package shellpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -604,7 +604,7 @@ type AuthorizeEnvironmentRequest struct {
 	IdToken string `protobuf:"bytes,4,opt,name=id_token,json=idToken,proto3" json:"id_token,omitempty"`
 	// The time when the credentials expire. If not set, defaults to one hour from
 	// when the server received the request.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *AuthorizeEnvironmentRequest) Reset() {
@@ -660,7 +660,7 @@ func (x *AuthorizeEnvironmentRequest) GetIdToken() string {
 	return ""
 }
 
-func (x *AuthorizeEnvironmentRequest) GetExpireTime() *timestamp.Timestamp {
+func (x *AuthorizeEnvironmentRequest) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -1443,7 +1443,7 @@ var file_google_cloud_shell_v1_cloudshell_proto_goTypes = []interface{}{
 	(*RemovePublicKeyResponse)(nil),                 // 17: google.cloud.shell.v1.RemovePublicKeyResponse
 	(*RemovePublicKeyMetadata)(nil),                 // 18: google.cloud.shell.v1.RemovePublicKeyMetadata
 	(*CloudShellErrorDetails)(nil),                  // 19: google.cloud.shell.v1.CloudShellErrorDetails
-	(*timestamp.Timestamp)(nil),                     // 20: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                   // 20: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),                   // 21: google.longrunning.Operation
 }
 var file_google_cloud_shell_v1_cloudshell_proto_depIdxs = []int32{
diff --git a/shell/go.mod b/shell/go.mod
index b10476747bc..1a9a615a7f3 100644
--- a/shell/go.mod
+++ b/shell/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/shell
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/shell/go.sum b/shell/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/shell/go.sum
+++ b/shell/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/speech/apiv1/adaptation_client.go b/speech/apiv1/adaptation_client.go
index 841bc7d4c97..17ef6523745 100644
--- a/speech/apiv1/adaptation_client.go
+++ b/speech/apiv1/adaptation_client.go
@@ -22,12 +22,12 @@ import (
 	"math"
 	"net/url"
 
+	speechpb "cloud.google.com/go/speech/apiv1/speechpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/speech/apiv1/adaptation_client_example_test.go b/speech/apiv1/adaptation_client_example_test.go
index cba176af062..e69e898ecdb 100644
--- a/speech/apiv1/adaptation_client_example_test.go
+++ b/speech/apiv1/adaptation_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	speech "cloud.google.com/go/speech/apiv1"
+	speechpb "cloud.google.com/go/speech/apiv1/speechpb"
 	"google.golang.org/api/iterator"
-	speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1"
 )
 
 func ExampleNewAdaptationClient() {
@@ -56,7 +56,7 @@ func ExampleAdaptationClient_CreatePhraseSet() {
 
 	req := &speechpb.CreatePhraseSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#CreatePhraseSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#CreatePhraseSetRequest.
 	}
 	resp, err := c.CreatePhraseSet(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleAdaptationClient_GetPhraseSet() {
 
 	req := &speechpb.GetPhraseSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#GetPhraseSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#GetPhraseSetRequest.
 	}
 	resp, err := c.GetPhraseSet(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleAdaptationClient_ListPhraseSet() {
 
 	req := &speechpb.ListPhraseSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#ListPhraseSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#ListPhraseSetRequest.
 	}
 	it := c.ListPhraseSet(ctx, req)
 	for {
@@ -137,7 +137,7 @@ func ExampleAdaptationClient_UpdatePhraseSet() {
 
 	req := &speechpb.UpdatePhraseSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#UpdatePhraseSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#UpdatePhraseSetRequest.
 	}
 	resp, err := c.UpdatePhraseSet(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleAdaptationClient_DeletePhraseSet() {
 
 	req := &speechpb.DeletePhraseSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#DeletePhraseSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#DeletePhraseSetRequest.
 	}
 	err = c.DeletePhraseSet(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleAdaptationClient_CreateCustomClass() {
 
 	req := &speechpb.CreateCustomClassRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#CreateCustomClassRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#CreateCustomClassRequest.
 	}
 	resp, err := c.CreateCustomClass(ctx, req)
 	if err != nil {
@@ -210,7 +210,7 @@ func ExampleAdaptationClient_GetCustomClass() {
 
 	req := &speechpb.GetCustomClassRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#GetCustomClassRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#GetCustomClassRequest.
 	}
 	resp, err := c.GetCustomClass(ctx, req)
 	if err != nil {
@@ -235,7 +235,7 @@ func ExampleAdaptationClient_ListCustomClasses() {
 
 	req := &speechpb.ListCustomClassesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#ListCustomClassesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#ListCustomClassesRequest.
 	}
 	it := c.ListCustomClasses(ctx, req)
 	for {
@@ -266,7 +266,7 @@ func ExampleAdaptationClient_UpdateCustomClass() {
 
 	req := &speechpb.UpdateCustomClassRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#UpdateCustomClassRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#UpdateCustomClassRequest.
 	}
 	resp, err := c.UpdateCustomClass(ctx, req)
 	if err != nil {
@@ -291,7 +291,7 @@ func ExampleAdaptationClient_DeleteCustomClass() {
 
 	req := &speechpb.DeleteCustomClassRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#DeleteCustomClassRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#DeleteCustomClassRequest.
 	}
 	err = c.DeleteCustomClass(ctx, req)
 	if err != nil {
diff --git a/speech/apiv1/doc.go b/speech/apiv1/doc.go
index a3b8cabb74e..b4977d031bb 100644
--- a/speech/apiv1/doc.go
+++ b/speech/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &speechpb.RecognizeRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#RecognizeRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#RecognizeRequest.
 //	}
 //	resp, err := c.Recognize(ctx, req)
 //	if err != nil {
diff --git a/speech/apiv1/speech_client.go b/speech/apiv1/speech_client.go
index 95f25ac1766..99e5a7066d9 100644
--- a/speech/apiv1/speech_client.go
+++ b/speech/apiv1/speech_client.go
@@ -23,11 +23,11 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	speechpb "cloud.google.com/go/speech/apiv1/speechpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/speech/apiv1/speech_client_example_test.go b/speech/apiv1/speech_client_example_test.go
index 81f65899eee..374b5406c23 100644
--- a/speech/apiv1/speech_client_example_test.go
+++ b/speech/apiv1/speech_client_example_test.go
@@ -21,7 +21,7 @@ import (
 	"io"
 
 	speech "cloud.google.com/go/speech/apiv1"
-	speechpb "google.golang.org/genproto/googleapis/cloud/speech/v1"
+	speechpb "cloud.google.com/go/speech/apiv1/speechpb"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_Recognize() {
 
 	req := &speechpb.RecognizeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#RecognizeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#RecognizeRequest.
 	}
 	resp, err := c.Recognize(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_LongRunningRecognize() {
 
 	req := &speechpb.LongRunningRecognizeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/speech/v1#LongRunningRecognizeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/speech/apiv1/speechpb#LongRunningRecognizeRequest.
 	}
 	op, err := c.LongRunningRecognize(ctx, req)
 	if err != nil {
diff --git a/speech/apiv1/speechpb/cloud_speech.pb.go b/speech/apiv1/speechpb/cloud_speech.pb.go
index 224019403db..ed1c64ae987 100644
--- a/speech/apiv1/speechpb/cloud_speech.pb.go
+++ b/speech/apiv1/speechpb/cloud_speech.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/speech/v1/cloud_speech.proto
 
 package speechpb
@@ -25,9 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	longrunning "google.golang.org/genproto/googleapis/longrunning"
 	status "google.golang.org/genproto/googleapis/rpc/status"
@@ -36,6 +33,9 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -977,13 +977,13 @@ type RecognitionConfig struct {
 	// the request. For example, "how are you question mark" becomes "how are
 	// you?". See https://cloud.google.com/speech-to-text/docs/spoken-punctuation
 	// for support. If 'false', spoken punctuation is not replaced.
-	EnableSpokenPunctuation *wrappers.BoolValue `protobuf:"bytes,22,opt,name=enable_spoken_punctuation,json=enableSpokenPunctuation,proto3" json:"enable_spoken_punctuation,omitempty"`
+	EnableSpokenPunctuation *wrapperspb.BoolValue `protobuf:"bytes,22,opt,name=enable_spoken_punctuation,json=enableSpokenPunctuation,proto3" json:"enable_spoken_punctuation,omitempty"`
 	// The spoken emoji behavior for the call
 	// If not set, uses default behavior based on model of choice
 	// If 'true', adds spoken emoji formatting for the request. This will replace
 	// spoken emojis with the corresponding Unicode symbols in the final
 	// transcript. If 'false', spoken emojis are not replaced.
-	EnableSpokenEmojis *wrappers.BoolValue `protobuf:"bytes,23,opt,name=enable_spoken_emojis,json=enableSpokenEmojis,proto3" json:"enable_spoken_emojis,omitempty"`
+	EnableSpokenEmojis *wrapperspb.BoolValue `protobuf:"bytes,23,opt,name=enable_spoken_emojis,json=enableSpokenEmojis,proto3" json:"enable_spoken_emojis,omitempty"`
 	// Config to enable speaker diarization and set additional
 	// parameters to make diarization better suited for your application.
 	// Note: When this is enabled, we send all the words from the beginning of the
@@ -1183,14 +1183,14 @@ func (x *RecognitionConfig) GetEnableAutomaticPunctuation() bool {
 	return false
 }
 
-func (x *RecognitionConfig) GetEnableSpokenPunctuation() *wrappers.BoolValue {
+func (x *RecognitionConfig) GetEnableSpokenPunctuation() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.EnableSpokenPunctuation
 	}
 	return nil
 }
 
-func (x *RecognitionConfig) GetEnableSpokenEmojis() *wrappers.BoolValue {
+func (x *RecognitionConfig) GetEnableSpokenEmojis() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.EnableSpokenEmojis
 	}
@@ -1620,7 +1620,7 @@ type RecognizeResponse struct {
 	// sequential portions of audio.
 	Results []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
 	// When available, billed audio seconds for the corresponding request.
-	TotalBilledTime *duration.Duration `protobuf:"bytes,3,opt,name=total_billed_time,json=totalBilledTime,proto3" json:"total_billed_time,omitempty"`
+	TotalBilledTime *durationpb.Duration `protobuf:"bytes,3,opt,name=total_billed_time,json=totalBilledTime,proto3" json:"total_billed_time,omitempty"`
 }
 
 func (x *RecognizeResponse) Reset() {
@@ -1662,7 +1662,7 @@ func (x *RecognizeResponse) GetResults() []*SpeechRecognitionResult {
 	return nil
 }
 
-func (x *RecognizeResponse) GetTotalBilledTime() *duration.Duration {
+func (x *RecognizeResponse) GetTotalBilledTime() *durationpb.Duration {
 	if x != nil {
 		return x.TotalBilledTime
 	}
@@ -1683,7 +1683,7 @@ type LongRunningRecognizeResponse struct {
 	// sequential portions of audio.
 	Results []*SpeechRecognitionResult `protobuf:"bytes,2,rep,name=results,proto3" json:"results,omitempty"`
 	// When available, billed audio seconds for the corresponding request.
-	TotalBilledTime *duration.Duration `protobuf:"bytes,3,opt,name=total_billed_time,json=totalBilledTime,proto3" json:"total_billed_time,omitempty"`
+	TotalBilledTime *durationpb.Duration `protobuf:"bytes,3,opt,name=total_billed_time,json=totalBilledTime,proto3" json:"total_billed_time,omitempty"`
 	// Original output config if present in the request.
 	OutputConfig *TranscriptOutputConfig `protobuf:"bytes,6,opt,name=output_config,json=outputConfig,proto3" json:"output_config,omitempty"`
 	// If the transcript output fails this field contains the relevant error.
@@ -1729,7 +1729,7 @@ func (x *LongRunningRecognizeResponse) GetResults() []*SpeechRecognitionResult {
 	return nil
 }
 
-func (x *LongRunningRecognizeResponse) GetTotalBilledTime() *duration.Duration {
+func (x *LongRunningRecognizeResponse) GetTotalBilledTime() *durationpb.Duration {
 	if x != nil {
 		return x.TotalBilledTime
 	}
@@ -1762,9 +1762,9 @@ type LongRunningRecognizeMetadata struct {
 	// when the audio is fully processed and the results are available.
 	ProgressPercent int32 `protobuf:"varint,1,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 	// Time when the request was received.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time of the most recent processing update.
-	LastUpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
+	LastUpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=last_update_time,json=lastUpdateTime,proto3" json:"last_update_time,omitempty"`
 	// Output only. The URI of the audio file being transcribed. Empty if the audio was sent
 	// as byte content.
 	Uri string `protobuf:"bytes,4,opt,name=uri,proto3" json:"uri,omitempty"`
@@ -1809,14 +1809,14 @@ func (x *LongRunningRecognizeMetadata) GetProgressPercent() int32 {
 	return 0
 }
 
-func (x *LongRunningRecognizeMetadata) GetStartTime() *timestamp.Timestamp {
+func (x *LongRunningRecognizeMetadata) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *LongRunningRecognizeMetadata) GetLastUpdateTime() *timestamp.Timestamp {
+func (x *LongRunningRecognizeMetadata) GetLastUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastUpdateTime
 	}
@@ -1896,7 +1896,7 @@ type StreamingRecognizeResponse struct {
 	SpeechEventType StreamingRecognizeResponse_SpeechEventType `protobuf:"varint,4,opt,name=speech_event_type,json=speechEventType,proto3,enum=google.cloud.speech.v1.StreamingRecognizeResponse_SpeechEventType" json:"speech_event_type,omitempty"`
 	// When available, billed audio seconds for the stream.
 	// Set only if this is the last response in the stream.
-	TotalBilledTime *duration.Duration `protobuf:"bytes,5,opt,name=total_billed_time,json=totalBilledTime,proto3" json:"total_billed_time,omitempty"`
+	TotalBilledTime *durationpb.Duration `protobuf:"bytes,5,opt,name=total_billed_time,json=totalBilledTime,proto3" json:"total_billed_time,omitempty"`
 }
 
 func (x *StreamingRecognizeResponse) Reset() {
@@ -1952,7 +1952,7 @@ func (x *StreamingRecognizeResponse) GetSpeechEventType() StreamingRecognizeResp
 	return StreamingRecognizeResponse_SPEECH_EVENT_UNSPECIFIED
 }
 
-func (x *StreamingRecognizeResponse) GetTotalBilledTime() *duration.Duration {
+func (x *StreamingRecognizeResponse) GetTotalBilledTime() *durationpb.Duration {
 	if x != nil {
 		return x.TotalBilledTime
 	}
@@ -1985,7 +1985,7 @@ type StreamingRecognitionResult struct {
 	Stability float32 `protobuf:"fixed32,3,opt,name=stability,proto3" json:"stability,omitempty"`
 	// Time offset of the end of this result relative to the
 	// beginning of the audio.
-	ResultEndTime *duration.Duration `protobuf:"bytes,4,opt,name=result_end_time,json=resultEndTime,proto3" json:"result_end_time,omitempty"`
+	ResultEndTime *durationpb.Duration `protobuf:"bytes,4,opt,name=result_end_time,json=resultEndTime,proto3" json:"result_end_time,omitempty"`
 	// For multi-channel audio, this is the channel number corresponding to the
 	// recognized result for the audio from that channel.
 	// For audio_channel_count = N, its output values can range from '1' to 'N'.
@@ -2049,7 +2049,7 @@ func (x *StreamingRecognitionResult) GetStability() float32 {
 	return 0
 }
 
-func (x *StreamingRecognitionResult) GetResultEndTime() *duration.Duration {
+func (x *StreamingRecognitionResult) GetResultEndTime() *durationpb.Duration {
 	if x != nil {
 		return x.ResultEndTime
 	}
@@ -2087,7 +2087,7 @@ type SpeechRecognitionResult struct {
 	ChannelTag int32 `protobuf:"varint,2,opt,name=channel_tag,json=channelTag,proto3" json:"channel_tag,omitempty"`
 	// Time offset of the end of this result relative to the
 	// beginning of the audio.
-	ResultEndTime *duration.Duration `protobuf:"bytes,4,opt,name=result_end_time,json=resultEndTime,proto3" json:"result_end_time,omitempty"`
+	ResultEndTime *durationpb.Duration `protobuf:"bytes,4,opt,name=result_end_time,json=resultEndTime,proto3" json:"result_end_time,omitempty"`
 	// Output only. The [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag
 	// of the language in this result. This language code was detected to have
 	// the most likelihood of being spoken in the audio.
@@ -2140,7 +2140,7 @@ func (x *SpeechRecognitionResult) GetChannelTag() int32 {
 	return 0
 }
 
-func (x *SpeechRecognitionResult) GetResultEndTime() *duration.Duration {
+func (x *SpeechRecognitionResult) GetResultEndTime() *durationpb.Duration {
 	if x != nil {
 		return x.ResultEndTime
 	}
@@ -2244,14 +2244,14 @@ type WordInfo struct {
 	// in the top hypothesis.
 	// This is an experimental feature and the accuracy of the time offset can
 	// vary.
-	StartTime *duration.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *durationpb.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time offset relative to the beginning of the audio,
 	// and corresponding to the end of the spoken word.
 	// This field is only set if `enable_word_time_offsets=true` and only
 	// in the top hypothesis.
 	// This is an experimental feature and the accuracy of the time offset can
 	// vary.
-	EndTime *duration.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *durationpb.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The word corresponding to this set of information.
 	Word string `protobuf:"bytes,3,opt,name=word,proto3" json:"word,omitempty"`
 	// The confidence estimate between 0.0 and 1.0. A higher number
@@ -2302,14 +2302,14 @@ func (*WordInfo) Descriptor() ([]byte, []int) {
 	return file_google_cloud_speech_v1_cloud_speech_proto_rawDescGZIP(), []int{17}
 }
 
-func (x *WordInfo) GetStartTime() *duration.Duration {
+func (x *WordInfo) GetStartTime() *durationpb.Duration {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *WordInfo) GetEndTime() *duration.Duration {
+func (x *WordInfo) GetEndTime() *durationpb.Duration {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2817,10 +2817,10 @@ var file_google_cloud_speech_v1_cloud_speech_proto_goTypes = []interface{}{
 	(*SpeechRecognitionAlternative)(nil),            // 22: google.cloud.speech.v1.SpeechRecognitionAlternative
 	(*WordInfo)(nil),                                // 23: google.cloud.speech.v1.WordInfo
 	(*SpeechAdaptation)(nil),                        // 24: google.cloud.speech.v1.SpeechAdaptation
-	(*wrappers.BoolValue)(nil),                      // 25: google.protobuf.BoolValue
-	(*duration.Duration)(nil),                       // 26: google.protobuf.Duration
+	(*wrapperspb.BoolValue)(nil),                    // 25: google.protobuf.BoolValue
+	(*durationpb.Duration)(nil),                     // 26: google.protobuf.Duration
 	(*status.Status)(nil),                           // 27: google.rpc.Status
-	(*timestamp.Timestamp)(nil),                     // 28: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                   // 28: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),                   // 29: google.longrunning.Operation
 }
 var file_google_cloud_speech_v1_cloud_speech_proto_depIdxs = []int32{
diff --git a/speech/apiv1/speechpb/cloud_speech_adaptation.pb.go b/speech/apiv1/speechpb/cloud_speech_adaptation.pb.go
index b35efe02604..ef1a6de606f 100644
--- a/speech/apiv1/speechpb/cloud_speech_adaptation.pb.go
+++ b/speech/apiv1/speechpb/cloud_speech_adaptation.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/speech/v1/cloud_speech_adaptation.proto
 
 package speechpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -141,7 +141,7 @@ type UpdatePhraseSetRequest struct {
 	// with matching `us` or `eu` location value.
 	PhraseSet *PhraseSet `protobuf:"bytes,1,opt,name=phrase_set,json=phraseSet,proto3" json:"phrase_set,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdatePhraseSetRequest) Reset() {
@@ -183,7 +183,7 @@ func (x *UpdatePhraseSetRequest) GetPhraseSet() *PhraseSet {
 	return nil
 }
 
-func (x *UpdatePhraseSetRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdatePhraseSetRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -538,7 +538,7 @@ type UpdateCustomClassRequest struct {
 	// with matching `us` or `eu` location value.
 	CustomClass *CustomClass `protobuf:"bytes,1,opt,name=custom_class,json=customClass,proto3" json:"custom_class,omitempty"`
 	// The list of fields to be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCustomClassRequest) Reset() {
@@ -580,7 +580,7 @@ func (x *UpdateCustomClassRequest) GetCustomClass() *CustomClass {
 	return nil
 }
 
-func (x *UpdateCustomClassRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCustomClassRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1122,9 +1122,9 @@ var file_google_cloud_speech_v1_cloud_speech_adaptation_proto_goTypes = []interf
 	(*ListCustomClassesResponse)(nil), // 10: google.cloud.speech.v1.ListCustomClassesResponse
 	(*DeleteCustomClassRequest)(nil),  // 11: google.cloud.speech.v1.DeleteCustomClassRequest
 	(*PhraseSet)(nil),                 // 12: google.cloud.speech.v1.PhraseSet
-	(*field_mask.FieldMask)(nil),      // 13: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),     // 13: google.protobuf.FieldMask
 	(*CustomClass)(nil),               // 14: google.cloud.speech.v1.CustomClass
-	(*empty.Empty)(nil),               // 15: google.protobuf.Empty
+	(*emptypb.Empty)(nil),             // 15: google.protobuf.Empty
 }
 var file_google_cloud_speech_v1_cloud_speech_adaptation_proto_depIdxs = []int32{
 	12, // 0: google.cloud.speech.v1.CreatePhraseSetRequest.phrase_set:type_name -> google.cloud.speech.v1.PhraseSet
@@ -1357,7 +1357,7 @@ type AdaptationClient interface {
 	// Update a phrase set.
 	UpdatePhraseSet(ctx context.Context, in *UpdatePhraseSetRequest, opts ...grpc.CallOption) (*PhraseSet, error)
 	// Delete a phrase set.
-	DeletePhraseSet(ctx context.Context, in *DeletePhraseSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeletePhraseSet(ctx context.Context, in *DeletePhraseSetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Create a custom class.
 	CreateCustomClass(ctx context.Context, in *CreateCustomClassRequest, opts ...grpc.CallOption) (*CustomClass, error)
 	// Get a custom class.
@@ -1367,7 +1367,7 @@ type AdaptationClient interface {
 	// Update a custom class.
 	UpdateCustomClass(ctx context.Context, in *UpdateCustomClassRequest, opts ...grpc.CallOption) (*CustomClass, error)
 	// Delete a custom class.
-	DeleteCustomClass(ctx context.Context, in *DeleteCustomClassRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteCustomClass(ctx context.Context, in *DeleteCustomClassRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type adaptationClient struct {
@@ -1414,8 +1414,8 @@ func (c *adaptationClient) UpdatePhraseSet(ctx context.Context, in *UpdatePhrase
 	return out, nil
 }
 
-func (c *adaptationClient) DeletePhraseSet(ctx context.Context, in *DeletePhraseSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *adaptationClient) DeletePhraseSet(ctx context.Context, in *DeletePhraseSetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.speech.v1.Adaptation/DeletePhraseSet", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1459,8 +1459,8 @@ func (c *adaptationClient) UpdateCustomClass(ctx context.Context, in *UpdateCust
 	return out, nil
 }
 
-func (c *adaptationClient) DeleteCustomClass(ctx context.Context, in *DeleteCustomClassRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *adaptationClient) DeleteCustomClass(ctx context.Context, in *DeleteCustomClassRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.speech.v1.Adaptation/DeleteCustomClass", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1481,7 +1481,7 @@ type AdaptationServer interface {
 	// Update a phrase set.
 	UpdatePhraseSet(context.Context, *UpdatePhraseSetRequest) (*PhraseSet, error)
 	// Delete a phrase set.
-	DeletePhraseSet(context.Context, *DeletePhraseSetRequest) (*empty.Empty, error)
+	DeletePhraseSet(context.Context, *DeletePhraseSetRequest) (*emptypb.Empty, error)
 	// Create a custom class.
 	CreateCustomClass(context.Context, *CreateCustomClassRequest) (*CustomClass, error)
 	// Get a custom class.
@@ -1491,7 +1491,7 @@ type AdaptationServer interface {
 	// Update a custom class.
 	UpdateCustomClass(context.Context, *UpdateCustomClassRequest) (*CustomClass, error)
 	// Delete a custom class.
-	DeleteCustomClass(context.Context, *DeleteCustomClassRequest) (*empty.Empty, error)
+	DeleteCustomClass(context.Context, *DeleteCustomClassRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedAdaptationServer can be embedded to have forward compatible implementations.
@@ -1510,7 +1510,7 @@ func (*UnimplementedAdaptationServer) ListPhraseSet(context.Context, *ListPhrase
 func (*UnimplementedAdaptationServer) UpdatePhraseSet(context.Context, *UpdatePhraseSetRequest) (*PhraseSet, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdatePhraseSet not implemented")
 }
-func (*UnimplementedAdaptationServer) DeletePhraseSet(context.Context, *DeletePhraseSetRequest) (*empty.Empty, error) {
+func (*UnimplementedAdaptationServer) DeletePhraseSet(context.Context, *DeletePhraseSetRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletePhraseSet not implemented")
 }
 func (*UnimplementedAdaptationServer) CreateCustomClass(context.Context, *CreateCustomClassRequest) (*CustomClass, error) {
@@ -1525,7 +1525,7 @@ func (*UnimplementedAdaptationServer) ListCustomClasses(context.Context, *ListCu
 func (*UnimplementedAdaptationServer) UpdateCustomClass(context.Context, *UpdateCustomClassRequest) (*CustomClass, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateCustomClass not implemented")
 }
-func (*UnimplementedAdaptationServer) DeleteCustomClass(context.Context, *DeleteCustomClassRequest) (*empty.Empty, error) {
+func (*UnimplementedAdaptationServer) DeleteCustomClass(context.Context, *DeleteCustomClassRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteCustomClass not implemented")
 }
 
diff --git a/speech/apiv1/speechpb/resource.pb.go b/speech/apiv1/speechpb/resource.pb.go
index 478716ca48b..9ff423ee910 100644
--- a/speech/apiv1/speechpb/resource.pb.go
+++ b/speech/apiv1/speechpb/resource.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/speech/v1/resource.proto
 
 package speechpb
diff --git a/speech/go.mod b/speech/go.mod
index ff0825b18d0..de1684cf039 100644
--- a/speech/go.mod
+++ b/speech/go.mod
@@ -3,11 +3,12 @@ module cloud.google.com/go/speech
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go v0.105.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.100.0
-	google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -21,6 +22,6 @@ require (
 	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/speech/go.sum b/speech/go.sum
index 9306af8cb39..a7c57802950 100644
--- a/speech/go.sum
+++ b/speech/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -39,6 +41,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -79,8 +82,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -96,8 +99,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y=
-google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/storagetransfer/aliasshim/aliasshim.go b/storagetransfer/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/storagetransfer/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/storagetransfer/apiv1/doc.go b/storagetransfer/apiv1/doc.go
index 827b6d454a3..691b6a5a108 100644
--- a/storagetransfer/apiv1/doc.go
+++ b/storagetransfer/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &storagetransferpb.GetGoogleServiceAccountRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#GetGoogleServiceAccountRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#GetGoogleServiceAccountRequest.
 //	}
 //	resp, err := c.GetGoogleServiceAccount(ctx, req)
 //	if err != nil {
diff --git a/storagetransfer/apiv1/storage_transfer_client.go b/storagetransfer/apiv1/storage_transfer_client.go
index bfdde5d7cb3..66d15e31002 100644
--- a/storagetransfer/apiv1/storage_transfer_client.go
+++ b/storagetransfer/apiv1/storage_transfer_client.go
@@ -25,13 +25,13 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	storagetransferpb "cloud.google.com/go/storagetransfer/apiv1/storagetransferpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-	storagetransferpb "google.golang.org/genproto/googleapis/storagetransfer/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/storagetransfer/apiv1/storage_transfer_client_example_test.go b/storagetransfer/apiv1/storage_transfer_client_example_test.go
index f6660892128..53d4cb94b89 100644
--- a/storagetransfer/apiv1/storage_transfer_client_example_test.go
+++ b/storagetransfer/apiv1/storage_transfer_client_example_test.go
@@ -20,9 +20,9 @@ import (
 	"context"
 
 	storagetransfer "cloud.google.com/go/storagetransfer/apiv1"
+	storagetransferpb "cloud.google.com/go/storagetransfer/apiv1/storagetransferpb"
 	"google.golang.org/api/iterator"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
-	storagetransferpb "google.golang.org/genproto/googleapis/storagetransfer/v1"
 )
 
 func ExampleNewClient() {
@@ -57,7 +57,7 @@ func ExampleClient_GetGoogleServiceAccount() {
 
 	req := &storagetransferpb.GetGoogleServiceAccountRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#GetGoogleServiceAccountRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#GetGoogleServiceAccountRequest.
 	}
 	resp, err := c.GetGoogleServiceAccount(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleClient_CreateTransferJob() {
 
 	req := &storagetransferpb.CreateTransferJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#CreateTransferJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#CreateTransferJobRequest.
 	}
 	resp, err := c.CreateTransferJob(ctx, req)
 	if err != nil {
@@ -107,7 +107,7 @@ func ExampleClient_UpdateTransferJob() {
 
 	req := &storagetransferpb.UpdateTransferJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#UpdateTransferJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#UpdateTransferJobRequest.
 	}
 	resp, err := c.UpdateTransferJob(ctx, req)
 	if err != nil {
@@ -132,7 +132,7 @@ func ExampleClient_GetTransferJob() {
 
 	req := &storagetransferpb.GetTransferJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#GetTransferJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#GetTransferJobRequest.
 	}
 	resp, err := c.GetTransferJob(ctx, req)
 	if err != nil {
@@ -157,7 +157,7 @@ func ExampleClient_ListTransferJobs() {
 
 	req := &storagetransferpb.ListTransferJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#ListTransferJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#ListTransferJobsRequest.
 	}
 	it := c.ListTransferJobs(ctx, req)
 	for {
@@ -188,7 +188,7 @@ func ExampleClient_PauseTransferOperation() {
 
 	req := &storagetransferpb.PauseTransferOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#PauseTransferOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#PauseTransferOperationRequest.
 	}
 	err = c.PauseTransferOperation(ctx, req)
 	if err != nil {
@@ -211,7 +211,7 @@ func ExampleClient_ResumeTransferOperation() {
 
 	req := &storagetransferpb.ResumeTransferOperationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#ResumeTransferOperationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#ResumeTransferOperationRequest.
 	}
 	err = c.ResumeTransferOperation(ctx, req)
 	if err != nil {
@@ -234,7 +234,7 @@ func ExampleClient_RunTransferJob() {
 
 	req := &storagetransferpb.RunTransferJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#RunTransferJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#RunTransferJobRequest.
 	}
 	op, err := c.RunTransferJob(ctx, req)
 	if err != nil {
@@ -262,7 +262,7 @@ func ExampleClient_DeleteTransferJob() {
 
 	req := &storagetransferpb.DeleteTransferJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#DeleteTransferJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#DeleteTransferJobRequest.
 	}
 	err = c.DeleteTransferJob(ctx, req)
 	if err != nil {
@@ -285,7 +285,7 @@ func ExampleClient_CreateAgentPool() {
 
 	req := &storagetransferpb.CreateAgentPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#CreateAgentPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#CreateAgentPoolRequest.
 	}
 	resp, err := c.CreateAgentPool(ctx, req)
 	if err != nil {
@@ -310,7 +310,7 @@ func ExampleClient_UpdateAgentPool() {
 
 	req := &storagetransferpb.UpdateAgentPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#UpdateAgentPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#UpdateAgentPoolRequest.
 	}
 	resp, err := c.UpdateAgentPool(ctx, req)
 	if err != nil {
@@ -335,7 +335,7 @@ func ExampleClient_GetAgentPool() {
 
 	req := &storagetransferpb.GetAgentPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#GetAgentPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#GetAgentPoolRequest.
 	}
 	resp, err := c.GetAgentPool(ctx, req)
 	if err != nil {
@@ -360,7 +360,7 @@ func ExampleClient_ListAgentPools() {
 
 	req := &storagetransferpb.ListAgentPoolsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#ListAgentPoolsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#ListAgentPoolsRequest.
 	}
 	it := c.ListAgentPools(ctx, req)
 	for {
@@ -391,7 +391,7 @@ func ExampleClient_DeleteAgentPool() {
 
 	req := &storagetransferpb.DeleteAgentPoolRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/storagetransfer/v1#DeleteAgentPoolRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/storagetransfer/apiv1/storagetransferpb#DeleteAgentPoolRequest.
 	}
 	err = c.DeleteAgentPool(ctx, req)
 	if err != nil {
diff --git a/storagetransfer/apiv1/storagetransferpb/transfer.pb.go b/storagetransfer/apiv1/storagetransferpb/transfer.pb.go
index 4f68af4cadf..36e383dc2bb 100644
--- a/storagetransfer/apiv1/storagetransferpb/transfer.pb.go
+++ b/storagetransfer/apiv1/storagetransferpb/transfer.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/storagetransfer/v1/transfer.proto
 
 package storagetransferpb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -174,7 +174,7 @@ type UpdateTransferJobRequest struct {
 	// complete transfer specification must be provided. An incomplete
 	// specification missing any required fields is rejected with the error
 	// [INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
-	UpdateTransferJobFieldMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=update_transfer_job_field_mask,json=updateTransferJobFieldMask,proto3" json:"update_transfer_job_field_mask,omitempty"`
+	UpdateTransferJobFieldMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=update_transfer_job_field_mask,json=updateTransferJobFieldMask,proto3" json:"update_transfer_job_field_mask,omitempty"`
 }
 
 func (x *UpdateTransferJobRequest) Reset() {
@@ -230,7 +230,7 @@ func (x *UpdateTransferJobRequest) GetTransferJob() *TransferJob {
 	return nil
 }
 
-func (x *UpdateTransferJobRequest) GetUpdateTransferJobFieldMask() *field_mask.FieldMask {
+func (x *UpdateTransferJobRequest) GetUpdateTransferJobFieldMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateTransferJobFieldMask
 	}
@@ -755,7 +755,7 @@ type UpdateAgentPoolRequest struct {
 	// *  [display_name][google.storagetransfer.v1.AgentPool.display_name]
 	//
 	// *  [bandwidth_limit][google.storagetransfer.v1.AgentPool.bandwidth_limit]
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateAgentPoolRequest) Reset() {
@@ -797,7 +797,7 @@ func (x *UpdateAgentPoolRequest) GetAgentPool() *AgentPool {
 	return nil
 }
 
-func (x *UpdateAgentPoolRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateAgentPoolRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1382,10 +1382,10 @@ var file_google_storagetransfer_v1_transfer_proto_goTypes = []interface{}{
 	(*ListAgentPoolsRequest)(nil),          // 14: google.storagetransfer.v1.ListAgentPoolsRequest
 	(*ListAgentPoolsResponse)(nil),         // 15: google.storagetransfer.v1.ListAgentPoolsResponse
 	(*TransferJob)(nil),                    // 16: google.storagetransfer.v1.TransferJob
-	(*field_mask.FieldMask)(nil),           // 17: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),          // 17: google.protobuf.FieldMask
 	(*AgentPool)(nil),                      // 18: google.storagetransfer.v1.AgentPool
 	(*GoogleServiceAccount)(nil),           // 19: google.storagetransfer.v1.GoogleServiceAccount
-	(*empty.Empty)(nil),                    // 20: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                  // 20: google.protobuf.Empty
 	(*longrunning.Operation)(nil),          // 21: google.longrunning.Operation
 }
 var file_google_storagetransfer_v1_transfer_proto_depIdxs = []int32{
@@ -1689,16 +1689,16 @@ type StorageTransferServiceClient interface {
 	// Lists transfer jobs.
 	ListTransferJobs(ctx context.Context, in *ListTransferJobsRequest, opts ...grpc.CallOption) (*ListTransferJobsResponse, error)
 	// Pauses a transfer operation.
-	PauseTransferOperation(ctx context.Context, in *PauseTransferOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	PauseTransferOperation(ctx context.Context, in *PauseTransferOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Resumes a transfer operation that is paused.
-	ResumeTransferOperation(ctx context.Context, in *ResumeTransferOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	ResumeTransferOperation(ctx context.Context, in *ResumeTransferOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Attempts to start a new TransferOperation for the current TransferJob. A
 	// TransferJob has a maximum of one active TransferOperation. If this method
 	// is called while a TransferOperation is active, an error will be returned.
 	RunTransferJob(ctx context.Context, in *RunTransferJobRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Deletes a transfer job. Deleting a transfer job sets its status to
 	// [DELETED][google.storagetransfer.v1.TransferJob.Status.DELETED].
-	DeleteTransferJob(ctx context.Context, in *DeleteTransferJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTransferJob(ctx context.Context, in *DeleteTransferJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates an agent pool resource.
 	CreateAgentPool(ctx context.Context, in *CreateAgentPoolRequest, opts ...grpc.CallOption) (*AgentPool, error)
 	// Updates an existing agent pool resource.
@@ -1708,7 +1708,7 @@ type StorageTransferServiceClient interface {
 	// Lists agent pools.
 	ListAgentPools(ctx context.Context, in *ListAgentPoolsRequest, opts ...grpc.CallOption) (*ListAgentPoolsResponse, error)
 	// Deletes an agent pool.
-	DeleteAgentPool(ctx context.Context, in *DeleteAgentPoolRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteAgentPool(ctx context.Context, in *DeleteAgentPoolRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type storageTransferServiceClient struct {
@@ -1764,8 +1764,8 @@ func (c *storageTransferServiceClient) ListTransferJobs(ctx context.Context, in
 	return out, nil
 }
 
-func (c *storageTransferServiceClient) PauseTransferOperation(ctx context.Context, in *PauseTransferOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *storageTransferServiceClient) PauseTransferOperation(ctx context.Context, in *PauseTransferOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/PauseTransferOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1773,8 +1773,8 @@ func (c *storageTransferServiceClient) PauseTransferOperation(ctx context.Contex
 	return out, nil
 }
 
-func (c *storageTransferServiceClient) ResumeTransferOperation(ctx context.Context, in *ResumeTransferOperationRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *storageTransferServiceClient) ResumeTransferOperation(ctx context.Context, in *ResumeTransferOperationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/ResumeTransferOperation", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1791,8 +1791,8 @@ func (c *storageTransferServiceClient) RunTransferJob(ctx context.Context, in *R
 	return out, nil
 }
 
-func (c *storageTransferServiceClient) DeleteTransferJob(ctx context.Context, in *DeleteTransferJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *storageTransferServiceClient) DeleteTransferJob(ctx context.Context, in *DeleteTransferJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/DeleteTransferJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1836,8 +1836,8 @@ func (c *storageTransferServiceClient) ListAgentPools(ctx context.Context, in *L
 	return out, nil
 }
 
-func (c *storageTransferServiceClient) DeleteAgentPool(ctx context.Context, in *DeleteAgentPoolRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *storageTransferServiceClient) DeleteAgentPool(ctx context.Context, in *DeleteAgentPoolRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.storagetransfer.v1.StorageTransferService/DeleteAgentPool", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1872,16 +1872,16 @@ type StorageTransferServiceServer interface {
 	// Lists transfer jobs.
 	ListTransferJobs(context.Context, *ListTransferJobsRequest) (*ListTransferJobsResponse, error)
 	// Pauses a transfer operation.
-	PauseTransferOperation(context.Context, *PauseTransferOperationRequest) (*empty.Empty, error)
+	PauseTransferOperation(context.Context, *PauseTransferOperationRequest) (*emptypb.Empty, error)
 	// Resumes a transfer operation that is paused.
-	ResumeTransferOperation(context.Context, *ResumeTransferOperationRequest) (*empty.Empty, error)
+	ResumeTransferOperation(context.Context, *ResumeTransferOperationRequest) (*emptypb.Empty, error)
 	// Attempts to start a new TransferOperation for the current TransferJob. A
 	// TransferJob has a maximum of one active TransferOperation. If this method
 	// is called while a TransferOperation is active, an error will be returned.
 	RunTransferJob(context.Context, *RunTransferJobRequest) (*longrunning.Operation, error)
 	// Deletes a transfer job. Deleting a transfer job sets its status to
 	// [DELETED][google.storagetransfer.v1.TransferJob.Status.DELETED].
-	DeleteTransferJob(context.Context, *DeleteTransferJobRequest) (*empty.Empty, error)
+	DeleteTransferJob(context.Context, *DeleteTransferJobRequest) (*emptypb.Empty, error)
 	// Creates an agent pool resource.
 	CreateAgentPool(context.Context, *CreateAgentPoolRequest) (*AgentPool, error)
 	// Updates an existing agent pool resource.
@@ -1891,7 +1891,7 @@ type StorageTransferServiceServer interface {
 	// Lists agent pools.
 	ListAgentPools(context.Context, *ListAgentPoolsRequest) (*ListAgentPoolsResponse, error)
 	// Deletes an agent pool.
-	DeleteAgentPool(context.Context, *DeleteAgentPoolRequest) (*empty.Empty, error)
+	DeleteAgentPool(context.Context, *DeleteAgentPoolRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedStorageTransferServiceServer can be embedded to have forward compatible implementations.
@@ -1913,16 +1913,16 @@ func (*UnimplementedStorageTransferServiceServer) GetTransferJob(context.Context
 func (*UnimplementedStorageTransferServiceServer) ListTransferJobs(context.Context, *ListTransferJobsRequest) (*ListTransferJobsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListTransferJobs not implemented")
 }
-func (*UnimplementedStorageTransferServiceServer) PauseTransferOperation(context.Context, *PauseTransferOperationRequest) (*empty.Empty, error) {
+func (*UnimplementedStorageTransferServiceServer) PauseTransferOperation(context.Context, *PauseTransferOperationRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PauseTransferOperation not implemented")
 }
-func (*UnimplementedStorageTransferServiceServer) ResumeTransferOperation(context.Context, *ResumeTransferOperationRequest) (*empty.Empty, error) {
+func (*UnimplementedStorageTransferServiceServer) ResumeTransferOperation(context.Context, *ResumeTransferOperationRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ResumeTransferOperation not implemented")
 }
 func (*UnimplementedStorageTransferServiceServer) RunTransferJob(context.Context, *RunTransferJobRequest) (*longrunning.Operation, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method RunTransferJob not implemented")
 }
-func (*UnimplementedStorageTransferServiceServer) DeleteTransferJob(context.Context, *DeleteTransferJobRequest) (*empty.Empty, error) {
+func (*UnimplementedStorageTransferServiceServer) DeleteTransferJob(context.Context, *DeleteTransferJobRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTransferJob not implemented")
 }
 func (*UnimplementedStorageTransferServiceServer) CreateAgentPool(context.Context, *CreateAgentPoolRequest) (*AgentPool, error) {
@@ -1937,7 +1937,7 @@ func (*UnimplementedStorageTransferServiceServer) GetAgentPool(context.Context,
 func (*UnimplementedStorageTransferServiceServer) ListAgentPools(context.Context, *ListAgentPoolsRequest) (*ListAgentPoolsResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ListAgentPools not implemented")
 }
-func (*UnimplementedStorageTransferServiceServer) DeleteAgentPool(context.Context, *DeleteAgentPoolRequest) (*empty.Empty, error) {
+func (*UnimplementedStorageTransferServiceServer) DeleteAgentPool(context.Context, *DeleteAgentPoolRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteAgentPool not implemented")
 }
 
diff --git a/storagetransfer/apiv1/storagetransferpb/transfer_types.pb.go b/storagetransfer/apiv1/storagetransferpb/transfer_types.pb.go
index b61d8d8182f..5678f22941d 100644
--- a/storagetransfer/apiv1/storagetransferpb/transfer_types.pb.go
+++ b/storagetransfer/apiv1/storagetransferpb/transfer_types.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/storagetransfer/v1/transfer_types.proto
 
 package storagetransferpb
@@ -24,14 +24,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1445,7 +1445,7 @@ type ObjectConditions struct {
 	// and the "last modification time" of the object is equal to or
 	// greater than the value of min_time_elapsed_since_last_modification`.
 	// Objects that do not have a "last modification time" are also transferred.
-	MinTimeElapsedSinceLastModification *duration.Duration `protobuf:"bytes,1,opt,name=min_time_elapsed_since_last_modification,json=minTimeElapsedSinceLastModification,proto3" json:"min_time_elapsed_since_last_modification,omitempty"`
+	MinTimeElapsedSinceLastModification *durationpb.Duration `protobuf:"bytes,1,opt,name=min_time_elapsed_since_last_modification,json=minTimeElapsedSinceLastModification,proto3" json:"min_time_elapsed_since_last_modification,omitempty"`
 	// Ensures that objects are not transferred if a specific maximum time
 	// has elapsed since the "last modification time".
 	// When a [TransferOperation][google.storagetransfer.v1.TransferOperation] begins, objects with a
@@ -1456,7 +1456,7 @@ type ObjectConditions struct {
 	//	is less than the value of max_time_elapsed_since_last_modification`.
 	//
 	// Objects that do not have a "last modification time" are also transferred.
-	MaxTimeElapsedSinceLastModification *duration.Duration `protobuf:"bytes,2,opt,name=max_time_elapsed_since_last_modification,json=maxTimeElapsedSinceLastModification,proto3" json:"max_time_elapsed_since_last_modification,omitempty"`
+	MaxTimeElapsedSinceLastModification *durationpb.Duration `protobuf:"bytes,2,opt,name=max_time_elapsed_since_last_modification,json=maxTimeElapsedSinceLastModification,proto3" json:"max_time_elapsed_since_last_modification,omitempty"`
 	// If you specify `include_prefixes`, Storage Transfer Service uses the items
 	// in the `include_prefixes` array to determine which objects to include in a
 	// transfer. Objects must start with one of the matching `include_prefixes`
@@ -1528,11 +1528,11 @@ type ObjectConditions struct {
 	// *  `last_modified_since` to the start of the day
 	//
 	// *  `last_modified_before` to the end of the day
-	LastModifiedSince *timestamp.Timestamp `protobuf:"bytes,5,opt,name=last_modified_since,json=lastModifiedSince,proto3" json:"last_modified_since,omitempty"`
+	LastModifiedSince *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=last_modified_since,json=lastModifiedSince,proto3" json:"last_modified_since,omitempty"`
 	// If specified, only objects with a "last modification time" before this
 	// timestamp and objects that don't have a "last modification time" are
 	// transferred.
-	LastModifiedBefore *timestamp.Timestamp `protobuf:"bytes,6,opt,name=last_modified_before,json=lastModifiedBefore,proto3" json:"last_modified_before,omitempty"`
+	LastModifiedBefore *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=last_modified_before,json=lastModifiedBefore,proto3" json:"last_modified_before,omitempty"`
 }
 
 func (x *ObjectConditions) Reset() {
@@ -1567,14 +1567,14 @@ func (*ObjectConditions) Descriptor() ([]byte, []int) {
 	return file_google_storagetransfer_v1_transfer_types_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *ObjectConditions) GetMinTimeElapsedSinceLastModification() *duration.Duration {
+func (x *ObjectConditions) GetMinTimeElapsedSinceLastModification() *durationpb.Duration {
 	if x != nil {
 		return x.MinTimeElapsedSinceLastModification
 	}
 	return nil
 }
 
-func (x *ObjectConditions) GetMaxTimeElapsedSinceLastModification() *duration.Duration {
+func (x *ObjectConditions) GetMaxTimeElapsedSinceLastModification() *durationpb.Duration {
 	if x != nil {
 		return x.MaxTimeElapsedSinceLastModification
 	}
@@ -1595,14 +1595,14 @@ func (x *ObjectConditions) GetExcludePrefixes() []string {
 	return nil
 }
 
-func (x *ObjectConditions) GetLastModifiedSince() *timestamp.Timestamp {
+func (x *ObjectConditions) GetLastModifiedSince() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastModifiedSince
 	}
 	return nil
 }
 
-func (x *ObjectConditions) GetLastModifiedBefore() *timestamp.Timestamp {
+func (x *ObjectConditions) GetLastModifiedBefore() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastModifiedBefore
 	}
@@ -2906,7 +2906,7 @@ type Schedule struct {
 	// Interval between the start of each scheduled TransferOperation. If
 	// unspecified, the default value is 24 hours. This value may not be less than
 	// 1 hour.
-	RepeatInterval *duration.Duration `protobuf:"bytes,5,opt,name=repeat_interval,json=repeatInterval,proto3" json:"repeat_interval,omitempty"`
+	RepeatInterval *durationpb.Duration `protobuf:"bytes,5,opt,name=repeat_interval,json=repeatInterval,proto3" json:"repeat_interval,omitempty"`
 }
 
 func (x *Schedule) Reset() {
@@ -2969,7 +2969,7 @@ func (x *Schedule) GetEndTimeOfDay() *timeofday.TimeOfDay {
 	return nil
 }
 
-func (x *Schedule) GetRepeatInterval() *duration.Duration {
+func (x *Schedule) GetRepeatInterval() *durationpb.Duration {
 	if x != nil {
 		return x.RepeatInterval
 	}
@@ -3036,11 +3036,11 @@ type TransferJob struct {
 	// current operation.
 	Status TransferJob_Status `protobuf:"varint,6,opt,name=status,proto3,enum=google.storagetransfer.v1.TransferJob_Status" json:"status,omitempty"`
 	// Output only. The time that the transfer job was created.
-	CreationTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"`
+	CreationTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=creation_time,json=creationTime,proto3" json:"creation_time,omitempty"`
 	// Output only. The time that the transfer job was last modified.
-	LastModificationTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=last_modification_time,json=lastModificationTime,proto3" json:"last_modification_time,omitempty"`
+	LastModificationTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=last_modification_time,json=lastModificationTime,proto3" json:"last_modification_time,omitempty"`
 	// Output only. The time that the transfer job was deleted.
-	DeletionTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=deletion_time,json=deletionTime,proto3" json:"deletion_time,omitempty"`
+	DeletionTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=deletion_time,json=deletionTime,proto3" json:"deletion_time,omitempty"`
 	// The name of the most recently started TransferOperation of this JobConfig.
 	// Present if a TransferOperation has been created for this JobConfig.
 	LatestOperationName string `protobuf:"bytes,12,opt,name=latest_operation_name,json=latestOperationName,proto3" json:"latest_operation_name,omitempty"`
@@ -3134,21 +3134,21 @@ func (x *TransferJob) GetStatus() TransferJob_Status {
 	return TransferJob_STATUS_UNSPECIFIED
 }
 
-func (x *TransferJob) GetCreationTime() *timestamp.Timestamp {
+func (x *TransferJob) GetCreationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreationTime
 	}
 	return nil
 }
 
-func (x *TransferJob) GetLastModificationTime() *timestamp.Timestamp {
+func (x *TransferJob) GetLastModificationTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastModificationTime
 	}
 	return nil
 }
 
-func (x *TransferJob) GetDeletionTime() *timestamp.Timestamp {
+func (x *TransferJob) GetDeletionTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.DeletionTime
 	}
@@ -3725,9 +3725,9 @@ type TransferOperation struct {
 	// Notification configuration.
 	NotificationConfig *NotificationConfig `protobuf:"bytes,10,opt,name=notification_config,json=notificationConfig,proto3" json:"notification_config,omitempty"`
 	// Start time of this transfer execution.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of this transfer execution.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Status of the transfer operation.
 	Status TransferOperation_Status `protobuf:"varint,6,opt,name=status,proto3,enum=google.storagetransfer.v1.TransferOperation_Status" json:"status,omitempty"`
 	// Information about the progress of the transfer operation.
@@ -3798,14 +3798,14 @@ func (x *TransferOperation) GetNotificationConfig() *NotificationConfig {
 	return nil
 }
 
-func (x *TransferOperation) GetStartTime() *timestamp.Timestamp {
+func (x *TransferOperation) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *TransferOperation) GetEndTime() *timestamp.Timestamp {
+func (x *TransferOperation) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -4666,8 +4666,8 @@ var file_google_storagetransfer_v1_transfer_types_proto_goTypes = []interface{}{
 	(*LoggingConfig)(nil),                     // 43: google.storagetransfer.v1.LoggingConfig
 	(*TransferOperation)(nil),                 // 44: google.storagetransfer.v1.TransferOperation
 	(*AgentPool_BandwidthLimit)(nil),          // 45: google.storagetransfer.v1.AgentPool.BandwidthLimit
-	(*duration.Duration)(nil),                 // 46: google.protobuf.Duration
-	(*timestamp.Timestamp)(nil),               // 47: google.protobuf.Timestamp
+	(*durationpb.Duration)(nil),               // 46: google.protobuf.Duration
+	(*timestamppb.Timestamp)(nil),             // 47: google.protobuf.Timestamp
 	(*date.Date)(nil),                         // 48: google.type.Date
 	(*timeofday.TimeOfDay)(nil),               // 49: google.type.TimeOfDay
 	(code.Code)(0),                            // 50: google.rpc.Code
diff --git a/storagetransfer/go.mod b/storagetransfer/go.mod
index 81effb8141c..d2f0be53308 100644
--- a/storagetransfer/go.mod
+++ b/storagetransfer/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/storagetransfer
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/storagetransfer/go.sum b/storagetransfer/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/storagetransfer/go.sum
+++ b/storagetransfer/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/talent/apiv4/company_client.go b/talent/apiv4/company_client.go
index 5edcaf5257e..885d3fb7196 100644
--- a/talent/apiv4/company_client.go
+++ b/talent/apiv4/company_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/talent/apiv4/company_client_example_test.go b/talent/apiv4/company_client_example_test.go
index 051f192c91f..bc40f675826 100644
--- a/talent/apiv4/company_client_example_test.go
+++ b/talent/apiv4/company_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	talent "cloud.google.com/go/talent/apiv4"
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	"google.golang.org/api/iterator"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleCompanyClient_CreateCompany() {
 
 	req := &talentpb.CreateCompanyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#CreateCompanyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#CreateCompanyRequest.
 	}
 	resp, err := c.CreateCompany(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleCompanyClient_GetCompany() {
 
 	req := &talentpb.GetCompanyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#GetCompanyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#GetCompanyRequest.
 	}
 	resp, err := c.GetCompany(ctx, req)
 	if err != nil {
@@ -107,7 +107,7 @@ func ExampleCompanyClient_UpdateCompany() {
 
 	req := &talentpb.UpdateCompanyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#UpdateCompanyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#UpdateCompanyRequest.
 	}
 	resp, err := c.UpdateCompany(ctx, req)
 	if err != nil {
@@ -132,7 +132,7 @@ func ExampleCompanyClient_DeleteCompany() {
 
 	req := &talentpb.DeleteCompanyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#DeleteCompanyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#DeleteCompanyRequest.
 	}
 	err = c.DeleteCompany(ctx, req)
 	if err != nil {
@@ -155,7 +155,7 @@ func ExampleCompanyClient_ListCompanies() {
 
 	req := &talentpb.ListCompaniesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#ListCompaniesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#ListCompaniesRequest.
 	}
 	it := c.ListCompanies(ctx, req)
 	for {
diff --git a/talent/apiv4/completion_client.go b/talent/apiv4/completion_client.go
index 42bcde3e784..90da2801a52 100644
--- a/talent/apiv4/completion_client.go
+++ b/talent/apiv4/completion_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/talent/apiv4/completion_client_example_test.go b/talent/apiv4/completion_client_example_test.go
index 464d309f768..4ca642577bf 100644
--- a/talent/apiv4/completion_client_example_test.go
+++ b/talent/apiv4/completion_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	talent "cloud.google.com/go/talent/apiv4"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -56,7 +56,7 @@ func ExampleCompletionClient_CompleteQuery() {
 
 	req := &talentpb.CompleteQueryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#CompleteQueryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#CompleteQueryRequest.
 	}
 	resp, err := c.CompleteQuery(ctx, req)
 	if err != nil {
diff --git a/talent/apiv4/doc.go b/talent/apiv4/doc.go
index bdb0f9d6a87..3758a2ab53d 100644
--- a/talent/apiv4/doc.go
+++ b/talent/apiv4/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &talentpb.CreateCompanyRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#CreateCompanyRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#CreateCompanyRequest.
 //	}
 //	resp, err := c.CreateCompany(ctx, req)
 //	if err != nil {
diff --git a/talent/apiv4/event_client.go b/talent/apiv4/event_client.go
index 650333c3df3..f4c6dfad6b0 100644
--- a/talent/apiv4/event_client.go
+++ b/talent/apiv4/event_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/talent/apiv4/event_client_example_test.go b/talent/apiv4/event_client_example_test.go
index ddd4e25fb50..77deeb8cb4c 100644
--- a/talent/apiv4/event_client_example_test.go
+++ b/talent/apiv4/event_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	talent "cloud.google.com/go/talent/apiv4"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -56,7 +56,7 @@ func ExampleEventClient_CreateClientEvent() {
 
 	req := &talentpb.CreateClientEventRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#CreateClientEventRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#CreateClientEventRequest.
 	}
 	resp, err := c.CreateClientEvent(ctx, req)
 	if err != nil {
diff --git a/talent/apiv4/job_client.go b/talent/apiv4/job_client.go
index e99f6fac0b8..4b6cd456dab 100644
--- a/talent/apiv4/job_client.go
+++ b/talent/apiv4/job_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/talent/apiv4/job_client_example_test.go b/talent/apiv4/job_client_example_test.go
index d41b7cda62b..10845ff741d 100644
--- a/talent/apiv4/job_client_example_test.go
+++ b/talent/apiv4/job_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	talent "cloud.google.com/go/talent/apiv4"
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	"google.golang.org/api/iterator"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleJobClient_CreateJob() {
 
 	req := &talentpb.CreateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#CreateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#CreateJobRequest.
 	}
 	resp, err := c.CreateJob(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleJobClient_BatchCreateJobs() {
 
 	req := &talentpb.BatchCreateJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#BatchCreateJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#BatchCreateJobsRequest.
 	}
 	op, err := c.BatchCreateJobs(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleJobClient_GetJob() {
 
 	req := &talentpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleJobClient_UpdateJob() {
 
 	req := &talentpb.UpdateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#UpdateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#UpdateJobRequest.
 	}
 	resp, err := c.UpdateJob(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleJobClient_BatchUpdateJobs() {
 
 	req := &talentpb.BatchUpdateJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#BatchUpdateJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#BatchUpdateJobsRequest.
 	}
 	op, err := c.BatchUpdateJobs(ctx, req)
 	if err != nil {
@@ -192,7 +192,7 @@ func ExampleJobClient_DeleteJob() {
 
 	req := &talentpb.DeleteJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#DeleteJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#DeleteJobRequest.
 	}
 	err = c.DeleteJob(ctx, req)
 	if err != nil {
@@ -215,7 +215,7 @@ func ExampleJobClient_BatchDeleteJobs() {
 
 	req := &talentpb.BatchDeleteJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#BatchDeleteJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#BatchDeleteJobsRequest.
 	}
 	op, err := c.BatchDeleteJobs(ctx, req)
 	if err != nil {
@@ -245,7 +245,7 @@ func ExampleJobClient_ListJobs() {
 
 	req := &talentpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
@@ -276,7 +276,7 @@ func ExampleJobClient_SearchJobs() {
 
 	req := &talentpb.SearchJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#SearchJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#SearchJobsRequest.
 	}
 	resp, err := c.SearchJobs(ctx, req)
 	if err != nil {
@@ -301,7 +301,7 @@ func ExampleJobClient_SearchJobsForAlert() {
 
 	req := &talentpb.SearchJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#SearchJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#SearchJobsRequest.
 	}
 	resp, err := c.SearchJobsForAlert(ctx, req)
 	if err != nil {
diff --git a/talent/apiv4/talentpb/common.pb.go b/talent/apiv4/talentpb/common.pb.go
index 5a1bc6f446b..2781ce5ff8c 100644
--- a/talent/apiv4/talentpb/common.pb.go
+++ b/talent/apiv4/talentpb/common.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/common.proto
 
 package talentpb
@@ -24,14 +24,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
-	wrappers "github.com/golang/protobuf/ptypes/wrappers"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	latlng "google.golang.org/genproto/googleapis/type/latlng"
 	money "google.golang.org/genproto/googleapis/type/money"
 	postaladdress "google.golang.org/genproto/googleapis/type/postaladdress"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -1312,9 +1312,9 @@ type TimestampRange struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Begin of the period (inclusive).
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End of the period (exclusive).
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *TimestampRange) Reset() {
@@ -1349,14 +1349,14 @@ func (*TimestampRange) Descriptor() ([]byte, []int) {
 	return file_google_cloud_talent_v4_common_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *TimestampRange) GetStartTime() *timestamp.Timestamp {
+func (x *TimestampRange) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *TimestampRange) GetEndTime() *timestamp.Timestamp {
+func (x *TimestampRange) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1956,14 +1956,14 @@ type BatchOperationMetadata struct {
 	// Count of total item(s) inside an operation.
 	TotalCount int32 `protobuf:"varint,5,opt,name=total_count,json=totalCount,proto3" json:"total_count,omitempty"`
 	// The time when the batch operation is created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time when the batch operation status is updated. The metadata and the
 	// [update_time][google.cloud.talent.v4.BatchOperationMetadata.update_time] is refreshed every minute otherwise cached data is
 	// returned.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The time when the batch operation is finished and
 	// [google.longrunning.Operation.done][google.longrunning.Operation.done] is set to `true`.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *BatchOperationMetadata) Reset() {
@@ -2033,21 +2033,21 @@ func (x *BatchOperationMetadata) GetTotalCount() int32 {
 	return 0
 }
 
-func (x *BatchOperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *BatchOperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *BatchOperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+func (x *BatchOperationMetadata) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *BatchOperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *BatchOperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2094,7 +2094,7 @@ type CompensationInfo_CompensationEntry struct {
 	// - WEEKLY: 52
 	// - MONTHLY: 12
 	// - ANNUAL: 1
-	ExpectedUnitsPerYear *wrappers.DoubleValue `protobuf:"bytes,6,opt,name=expected_units_per_year,json=expectedUnitsPerYear,proto3" json:"expected_units_per_year,omitempty"`
+	ExpectedUnitsPerYear *wrapperspb.DoubleValue `protobuf:"bytes,6,opt,name=expected_units_per_year,json=expectedUnitsPerYear,proto3" json:"expected_units_per_year,omitempty"`
 }
 
 func (x *CompensationInfo_CompensationEntry) Reset() {
@@ -2171,7 +2171,7 @@ func (x *CompensationInfo_CompensationEntry) GetDescription() string {
 	return ""
 }
 
-func (x *CompensationInfo_CompensationEntry) GetExpectedUnitsPerYear() *wrappers.DoubleValue {
+func (x *CompensationInfo_CompensationEntry) GetExpectedUnitsPerYear() *wrapperspb.DoubleValue {
 	if x != nil {
 		return x.ExpectedUnitsPerYear
 	}
@@ -2677,11 +2677,11 @@ var file_google_cloud_talent_v4_common_proto_goTypes = []interface{}{
 	(*BatchOperationMetadata)(nil),             // 23: google.cloud.talent.v4.BatchOperationMetadata
 	(*CompensationInfo_CompensationEntry)(nil), // 24: google.cloud.talent.v4.CompensationInfo.CompensationEntry
 	(*CompensationInfo_CompensationRange)(nil), // 25: google.cloud.talent.v4.CompensationInfo.CompensationRange
-	(*timestamp.Timestamp)(nil),                // 26: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),              // 26: google.protobuf.Timestamp
 	(*postaladdress.PostalAddress)(nil),        // 27: google.type.PostalAddress
 	(*latlng.LatLng)(nil),                      // 28: google.type.LatLng
 	(*money.Money)(nil),                        // 29: google.type.Money
-	(*wrappers.DoubleValue)(nil),               // 30: google.protobuf.DoubleValue
+	(*wrapperspb.DoubleValue)(nil),             // 30: google.protobuf.DoubleValue
 }
 var file_google_cloud_talent_v4_common_proto_depIdxs = []int32{
 	26, // 0: google.cloud.talent.v4.TimestampRange.start_time:type_name -> google.protobuf.Timestamp
diff --git a/talent/apiv4/talentpb/company.pb.go b/talent/apiv4/talentpb/company.pb.go
index 1a309d1fdf5..1e35050fc55 100644
--- a/talent/apiv4/talentpb/company.pb.go
+++ b/talent/apiv4/talentpb/company.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/company.proto
 
 package talentpb
diff --git a/talent/apiv4/talentpb/company_service.pb.go b/talent/apiv4/talentpb/company_service.pb.go
index 794d5770cd3..56aa7be29cf 100644
--- a/talent/apiv4/talentpb/company_service.pb.go
+++ b/talent/apiv4/talentpb/company_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/company_service.proto
 
 package talentpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -171,7 +171,7 @@ type UpdateCompanyRequest struct {
 	//
 	// A field mask to specify the company fields to be updated. Only
 	// top level fields of [Company][google.cloud.talent.v4.Company] are supported.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCompanyRequest) Reset() {
@@ -213,7 +213,7 @@ func (x *UpdateCompanyRequest) GetCompany() *Company {
 	return nil
 }
 
-func (x *UpdateCompanyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCompanyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -594,9 +594,9 @@ var file_google_cloud_talent_v4_company_service_proto_goTypes = []interface{}{
 	(*ListCompaniesRequest)(nil),  // 4: google.cloud.talent.v4.ListCompaniesRequest
 	(*ListCompaniesResponse)(nil), // 5: google.cloud.talent.v4.ListCompaniesResponse
 	(*Company)(nil),               // 6: google.cloud.talent.v4.Company
-	(*field_mask.FieldMask)(nil),  // 7: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil), // 7: google.protobuf.FieldMask
 	(*ResponseMetadata)(nil),      // 8: google.cloud.talent.v4.ResponseMetadata
-	(*empty.Empty)(nil),           // 9: google.protobuf.Empty
+	(*emptypb.Empty)(nil),         // 9: google.protobuf.Empty
 }
 var file_google_cloud_talent_v4_company_service_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.talent.v4.CreateCompanyRequest.company:type_name -> google.cloud.talent.v4.Company
@@ -742,7 +742,7 @@ type CompanyServiceClient interface {
 	UpdateCompany(ctx context.Context, in *UpdateCompanyRequest, opts ...grpc.CallOption) (*Company, error)
 	// Deletes specified company.
 	// Prerequisite: The company has no jobs associated with it.
-	DeleteCompany(ctx context.Context, in *DeleteCompanyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteCompany(ctx context.Context, in *DeleteCompanyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists all companies associated with the project.
 	ListCompanies(ctx context.Context, in *ListCompaniesRequest, opts ...grpc.CallOption) (*ListCompaniesResponse, error)
 }
@@ -782,8 +782,8 @@ func (c *companyServiceClient) UpdateCompany(ctx context.Context, in *UpdateComp
 	return out, nil
 }
 
-func (c *companyServiceClient) DeleteCompany(ctx context.Context, in *DeleteCompanyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *companyServiceClient) DeleteCompany(ctx context.Context, in *DeleteCompanyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.talent.v4.CompanyService/DeleteCompany", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -810,7 +810,7 @@ type CompanyServiceServer interface {
 	UpdateCompany(context.Context, *UpdateCompanyRequest) (*Company, error)
 	// Deletes specified company.
 	// Prerequisite: The company has no jobs associated with it.
-	DeleteCompany(context.Context, *DeleteCompanyRequest) (*empty.Empty, error)
+	DeleteCompany(context.Context, *DeleteCompanyRequest) (*emptypb.Empty, error)
 	// Lists all companies associated with the project.
 	ListCompanies(context.Context, *ListCompaniesRequest) (*ListCompaniesResponse, error)
 }
@@ -828,7 +828,7 @@ func (*UnimplementedCompanyServiceServer) GetCompany(context.Context, *GetCompan
 func (*UnimplementedCompanyServiceServer) UpdateCompany(context.Context, *UpdateCompanyRequest) (*Company, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateCompany not implemented")
 }
-func (*UnimplementedCompanyServiceServer) DeleteCompany(context.Context, *DeleteCompanyRequest) (*empty.Empty, error) {
+func (*UnimplementedCompanyServiceServer) DeleteCompany(context.Context, *DeleteCompanyRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteCompany not implemented")
 }
 func (*UnimplementedCompanyServiceServer) ListCompanies(context.Context, *ListCompaniesRequest) (*ListCompaniesResponse, error) {
diff --git a/talent/apiv4/talentpb/completion_service.pb.go b/talent/apiv4/talentpb/completion_service.pb.go
index d94a7d521f7..64ae697cde5 100644
--- a/talent/apiv4/talentpb/completion_service.pb.go
+++ b/talent/apiv4/talentpb/completion_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/completion_service.proto
 
 package talentpb
diff --git a/talent/apiv4/talentpb/event.pb.go b/talent/apiv4/talentpb/event.pb.go
index f54ec72ff8a..3fdc7b3d973 100644
--- a/talent/apiv4/talentpb/event.pb.go
+++ b/talent/apiv4/talentpb/event.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/event.proto
 
 package talentpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -203,7 +203,7 @@ type ClientEvent struct {
 	// Required. A unique identifier, generated by the client application.
 	EventId string `protobuf:"bytes,2,opt,name=event_id,json=eventId,proto3" json:"event_id,omitempty"`
 	// Required. The timestamp of the event.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Required.
 	//
 	// The detail information of a specific event type.
@@ -263,7 +263,7 @@ func (x *ClientEvent) GetEventId() string {
 	return ""
 }
 
-func (x *ClientEvent) GetCreateTime() *timestamp.Timestamp {
+func (x *ClientEvent) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -453,10 +453,10 @@ func file_google_cloud_talent_v4_event_proto_rawDescGZIP() []byte {
 var file_google_cloud_talent_v4_event_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_talent_v4_event_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_cloud_talent_v4_event_proto_goTypes = []interface{}{
-	(JobEvent_JobEventType)(0),  // 0: google.cloud.talent.v4.JobEvent.JobEventType
-	(*ClientEvent)(nil),         // 1: google.cloud.talent.v4.ClientEvent
-	(*JobEvent)(nil),            // 2: google.cloud.talent.v4.JobEvent
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(JobEvent_JobEventType)(0),    // 0: google.cloud.talent.v4.JobEvent.JobEventType
+	(*ClientEvent)(nil),           // 1: google.cloud.talent.v4.ClientEvent
+	(*JobEvent)(nil),              // 2: google.cloud.talent.v4.JobEvent
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
 }
 var file_google_cloud_talent_v4_event_proto_depIdxs = []int32{
 	3, // 0: google.cloud.talent.v4.ClientEvent.create_time:type_name -> google.protobuf.Timestamp
diff --git a/talent/apiv4/talentpb/event_service.pb.go b/talent/apiv4/talentpb/event_service.pb.go
index 153ef36bb06..a1e7006e236 100644
--- a/talent/apiv4/talentpb/event_service.pb.go
+++ b/talent/apiv4/talentpb/event_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/event_service.proto
 
 package talentpb
diff --git a/talent/apiv4/talentpb/filters.pb.go b/talent/apiv4/talentpb/filters.pb.go
index 7c0522aa392..a5385fb591f 100644
--- a/talent/apiv4/talentpb/filters.pb.go
+++ b/talent/apiv4/talentpb/filters.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/filters.proto
 
 package talentpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	latlng "google.golang.org/genproto/googleapis/type/latlng"
 	timeofday "google.golang.org/genproto/googleapis/type/timeofday"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -730,7 +730,7 @@ type CommuteFilter struct {
 	StartCoordinates *latlng.LatLng `protobuf:"bytes,2,opt,name=start_coordinates,json=startCoordinates,proto3" json:"start_coordinates,omitempty"`
 	// Required. The maximum travel time in seconds. The maximum allowed value is `3600s`
 	// (one hour). Format is `123s`.
-	TravelDuration *duration.Duration `protobuf:"bytes,3,opt,name=travel_duration,json=travelDuration,proto3" json:"travel_duration,omitempty"`
+	TravelDuration *durationpb.Duration `protobuf:"bytes,3,opt,name=travel_duration,json=travelDuration,proto3" json:"travel_duration,omitempty"`
 	// If `true`, jobs without street level addresses may also be returned.
 	// For city level addresses, the city center is used. For state and coarser
 	// level addresses, text matching is used.
@@ -792,7 +792,7 @@ func (x *CommuteFilter) GetStartCoordinates() *latlng.LatLng {
 	return nil
 }
 
-func (x *CommuteFilter) GetTravelDuration() *duration.Duration {
+func (x *CommuteFilter) GetTravelDuration() *durationpb.Duration {
 	if x != nil {
 		return x.TravelDuration
 	}
@@ -1050,7 +1050,7 @@ var file_google_cloud_talent_v4_filters_proto_goTypes = []interface{}{
 	(CompensationInfo_CompensationUnit)(0),     // 11: google.cloud.talent.v4.CompensationInfo.CompensationUnit
 	(*CompensationInfo_CompensationRange)(nil), // 12: google.cloud.talent.v4.CompensationInfo.CompensationRange
 	(CommuteMethod)(0),                         // 13: google.cloud.talent.v4.CommuteMethod
-	(*duration.Duration)(nil),                  // 14: google.protobuf.Duration
+	(*durationpb.Duration)(nil),                // 14: google.protobuf.Duration
 	(*timeofday.TimeOfDay)(nil),                // 15: google.type.TimeOfDay
 }
 var file_google_cloud_talent_v4_filters_proto_depIdxs = []int32{
diff --git a/talent/apiv4/talentpb/histogram.pb.go b/talent/apiv4/talentpb/histogram.pb.go
index 64f454f4e09..6ae3780d6d4 100644
--- a/talent/apiv4/talentpb/histogram.pb.go
+++ b/talent/apiv4/talentpb/histogram.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/histogram.proto
 
 package talentpb
diff --git a/talent/apiv4/talentpb/job.pb.go b/talent/apiv4/talentpb/job.pb.go
index e97678a9161..5eb9d9ee00b 100644
--- a/talent/apiv4/talentpb/job.pb.go
+++ b/talent/apiv4/talentpb/job.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/job.proto
 
 package talentpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -207,14 +207,14 @@ type Job struct {
 	Visibility Visibility `protobuf:"varint,21,opt,name=visibility,proto3,enum=google.cloud.talent.v4.Visibility" json:"visibility,omitempty"`
 	// The start timestamp of the job in UTC time zone. Typically this field
 	// is used for contracting engagements. Invalid timestamps are ignored.
-	JobStartTime *timestamp.Timestamp `protobuf:"bytes,22,opt,name=job_start_time,json=jobStartTime,proto3" json:"job_start_time,omitempty"`
+	JobStartTime *timestamppb.Timestamp `protobuf:"bytes,22,opt,name=job_start_time,json=jobStartTime,proto3" json:"job_start_time,omitempty"`
 	// The end timestamp of the job. Typically this field is used for contracting
 	// engagements. Invalid timestamps are ignored.
-	JobEndTime *timestamp.Timestamp `protobuf:"bytes,23,opt,name=job_end_time,json=jobEndTime,proto3" json:"job_end_time,omitempty"`
+	JobEndTime *timestamppb.Timestamp `protobuf:"bytes,23,opt,name=job_end_time,json=jobEndTime,proto3" json:"job_end_time,omitempty"`
 	// The timestamp this job posting was most recently published. The default
 	// value is the time the request arrives at the server. Invalid timestamps are
 	// ignored.
-	PostingPublishTime *timestamp.Timestamp `protobuf:"bytes,24,opt,name=posting_publish_time,json=postingPublishTime,proto3" json:"posting_publish_time,omitempty"`
+	PostingPublishTime *timestamppb.Timestamp `protobuf:"bytes,24,opt,name=posting_publish_time,json=postingPublishTime,proto3" json:"posting_publish_time,omitempty"`
 	// Strongly recommended for the best service experience.
 	//
 	// The expiration timestamp of the job. After this timestamp, the
@@ -256,11 +256,11 @@ type Job struct {
 	// [job_end_time][google.cloud.talent.v4.Job.job_end_time], or the masks are empty meaning that every field is
 	// updated, the job posting expires after 30 days from the job's last
 	// update time. Otherwise the expiration date isn't updated.
-	PostingExpireTime *timestamp.Timestamp `protobuf:"bytes,25,opt,name=posting_expire_time,json=postingExpireTime,proto3" json:"posting_expire_time,omitempty"`
+	PostingExpireTime *timestamppb.Timestamp `protobuf:"bytes,25,opt,name=posting_expire_time,json=postingExpireTime,proto3" json:"posting_expire_time,omitempty"`
 	// Output only. The timestamp when this job posting was created.
-	PostingCreateTime *timestamp.Timestamp `protobuf:"bytes,26,opt,name=posting_create_time,json=postingCreateTime,proto3" json:"posting_create_time,omitempty"`
+	PostingCreateTime *timestamppb.Timestamp `protobuf:"bytes,26,opt,name=posting_create_time,json=postingCreateTime,proto3" json:"posting_create_time,omitempty"`
 	// Output only. The timestamp when this job posting was last updated.
-	PostingUpdateTime *timestamp.Timestamp `protobuf:"bytes,27,opt,name=posting_update_time,json=postingUpdateTime,proto3" json:"posting_update_time,omitempty"`
+	PostingUpdateTime *timestamppb.Timestamp `protobuf:"bytes,27,opt,name=posting_update_time,json=postingUpdateTime,proto3" json:"posting_update_time,omitempty"`
 	// Output only. Display name of the company listing the job.
 	CompanyDisplayName string `protobuf:"bytes,28,opt,name=company_display_name,json=companyDisplayName,proto3" json:"company_display_name,omitempty"`
 	// Output only. Derived details about the job posting.
@@ -449,42 +449,42 @@ func (x *Job) GetVisibility() Visibility {
 	return Visibility_VISIBILITY_UNSPECIFIED
 }
 
-func (x *Job) GetJobStartTime() *timestamp.Timestamp {
+func (x *Job) GetJobStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.JobStartTime
 	}
 	return nil
 }
 
-func (x *Job) GetJobEndTime() *timestamp.Timestamp {
+func (x *Job) GetJobEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.JobEndTime
 	}
 	return nil
 }
 
-func (x *Job) GetPostingPublishTime() *timestamp.Timestamp {
+func (x *Job) GetPostingPublishTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PostingPublishTime
 	}
 	return nil
 }
 
-func (x *Job) GetPostingExpireTime() *timestamp.Timestamp {
+func (x *Job) GetPostingExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PostingExpireTime
 	}
 	return nil
 }
 
-func (x *Job) GetPostingCreateTime() *timestamp.Timestamp {
+func (x *Job) GetPostingCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PostingCreateTime
 	}
 	return nil
 }
 
-func (x *Job) GetPostingUpdateTime() *timestamp.Timestamp {
+func (x *Job) GetPostingUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.PostingUpdateTime
 	}
@@ -927,7 +927,7 @@ var file_google_cloud_talent_v4_job_proto_goTypes = []interface{}{
 	(JobLevel)(0),                 // 9: google.cloud.talent.v4.JobLevel
 	(PostingRegion)(0),            // 10: google.cloud.talent.v4.PostingRegion
 	(Visibility)(0),               // 11: google.cloud.talent.v4.Visibility
-	(*timestamp.Timestamp)(nil),   // 12: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil), // 12: google.protobuf.Timestamp
 	(*Location)(nil),              // 13: google.cloud.talent.v4.Location
 	(JobCategory)(0),              // 14: google.cloud.talent.v4.JobCategory
 	(HtmlSanitization)(0),         // 15: google.cloud.talent.v4.HtmlSanitization
diff --git a/talent/apiv4/talentpb/job_service.pb.go b/talent/apiv4/talentpb/job_service.pb.go
index d2cc5b148de..a7aa3e74ee1 100644
--- a/talent/apiv4/talentpb/job_service.pb.go
+++ b/talent/apiv4/talentpb/job_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/job_service.proto
 
 package talentpb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "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"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -545,7 +545,7 @@ type UpdateJobRequest struct {
 	//
 	// A field mask to restrict the fields that are updated. Only
 	// top level fields of [Job][google.cloud.talent.v4.Job] are supported.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateJobRequest) Reset() {
@@ -587,7 +587,7 @@ func (x *UpdateJobRequest) GetJob() *Job {
 	return nil
 }
 
-func (x *UpdateJobRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateJobRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1437,7 +1437,7 @@ type BatchUpdateJobsRequest struct {
 	// will only contains fields that is updated, plus the Id of the Job.
 	// Otherwise,  [Job][google.cloud.talent.v4.Job] will include all fields, which can yield a very
 	// large response.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *BatchUpdateJobsRequest) Reset() {
@@ -1486,7 +1486,7 @@ func (x *BatchUpdateJobsRequest) GetJobs() []*Job {
 	return nil
 }
 
-func (x *BatchUpdateJobsRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *BatchUpdateJobsRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1963,7 +1963,7 @@ type SearchJobsResponse_CommuteInfo struct {
 	// query location. A duration of 0 seconds indicates that the job isn't
 	// reachable within the requested duration, but was returned as part of an
 	// expanded query.
-	TravelDuration *duration.Duration `protobuf:"bytes,2,opt,name=travel_duration,json=travelDuration,proto3" json:"travel_duration,omitempty"`
+	TravelDuration *durationpb.Duration `protobuf:"bytes,2,opt,name=travel_duration,json=travelDuration,proto3" json:"travel_duration,omitempty"`
 }
 
 func (x *SearchJobsResponse_CommuteInfo) Reset() {
@@ -2005,7 +2005,7 @@ func (x *SearchJobsResponse_CommuteInfo) GetJobLocation() *Location {
 	return nil
 }
 
-func (x *SearchJobsResponse_CommuteInfo) GetTravelDuration() *duration.Duration {
+func (x *SearchJobsResponse_CommuteInfo) GetTravelDuration() *durationpb.Duration {
 	if x != nil {
 		return x.TravelDuration
 	}
@@ -2496,7 +2496,7 @@ var file_google_cloud_talent_v4_job_service_proto_goTypes = []interface{}{
 	(*SearchJobsResponse_MatchingJob)(nil),                   // 21: google.cloud.talent.v4.SearchJobsResponse.MatchingJob
 	(*SearchJobsResponse_CommuteInfo)(nil),                   // 22: google.cloud.talent.v4.SearchJobsResponse.CommuteInfo
 	(*Job)(nil),                                              // 23: google.cloud.talent.v4.Job
-	(*field_mask.FieldMask)(nil),                             // 24: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),                            // 24: google.protobuf.FieldMask
 	(*ResponseMetadata)(nil),                                 // 25: google.cloud.talent.v4.ResponseMetadata
 	(*RequestMetadata)(nil),                                  // 26: google.cloud.talent.v4.RequestMetadata
 	(*JobQuery)(nil),                                         // 27: google.cloud.talent.v4.JobQuery
@@ -2505,9 +2505,9 @@ var file_google_cloud_talent_v4_job_service_proto_goTypes = []interface{}{
 	(*Location)(nil),                                         // 30: google.cloud.talent.v4.Location
 	(*SpellingCorrection)(nil),                               // 31: google.cloud.talent.v4.SpellingCorrection
 	(*status.Status)(nil),                                    // 32: google.rpc.Status
-	(*duration.Duration)(nil),                                // 33: google.protobuf.Duration
+	(*durationpb.Duration)(nil),                              // 33: google.protobuf.Duration
 	(*longrunning.Operation)(nil),                            // 34: google.longrunning.Operation
-	(*empty.Empty)(nil),                                      // 35: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                                    // 35: google.protobuf.Empty
 }
 var file_google_cloud_talent_v4_job_service_proto_depIdxs = []int32{
 	23, // 0: google.cloud.talent.v4.CreateJobRequest.job:type_name -> google.cloud.talent.v4.Job
@@ -2850,7 +2850,7 @@ type JobServiceClient interface {
 	//
 	// Typically, the job becomes unsearchable within 10 seconds, but it may take
 	// up to 5 minutes.
-	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Begins executing a batch delete jobs operation.
 	BatchDeleteJobs(ctx context.Context, in *BatchDeleteJobsRequest, opts ...grpc.CallOption) (*longrunning.Operation, error)
 	// Lists jobs by filter.
@@ -2927,8 +2927,8 @@ func (c *jobServiceClient) BatchUpdateJobs(ctx context.Context, in *BatchUpdateJ
 	return out, nil
 }
 
-func (c *jobServiceClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *jobServiceClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.talent.v4.JobService/DeleteJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2995,7 +2995,7 @@ type JobServiceServer interface {
 	//
 	// Typically, the job becomes unsearchable within 10 seconds, but it may take
 	// up to 5 minutes.
-	DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error)
+	DeleteJob(context.Context, *DeleteJobRequest) (*emptypb.Empty, error)
 	// Begins executing a batch delete jobs operation.
 	BatchDeleteJobs(context.Context, *BatchDeleteJobsRequest) (*longrunning.Operation, error)
 	// Lists jobs by filter.
@@ -3038,7 +3038,7 @@ func (*UnimplementedJobServiceServer) UpdateJob(context.Context, *UpdateJobReque
 func (*UnimplementedJobServiceServer) BatchUpdateJobs(context.Context, *BatchUpdateJobsRequest) (*longrunning.Operation, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method BatchUpdateJobs not implemented")
 }
-func (*UnimplementedJobServiceServer) DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error) {
+func (*UnimplementedJobServiceServer) DeleteJob(context.Context, *DeleteJobRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteJob not implemented")
 }
 func (*UnimplementedJobServiceServer) BatchDeleteJobs(context.Context, *BatchDeleteJobsRequest) (*longrunning.Operation, error) {
diff --git a/talent/apiv4/talentpb/tenant.pb.go b/talent/apiv4/talentpb/tenant.pb.go
index 509e036a503..33a105096af 100644
--- a/talent/apiv4/talentpb/tenant.pb.go
+++ b/talent/apiv4/talentpb/tenant.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/tenant.proto
 
 package talentpb
diff --git a/talent/apiv4/talentpb/tenant_service.pb.go b/talent/apiv4/talentpb/tenant_service.pb.go
index a303aad5ee8..e333543e220 100644
--- a/talent/apiv4/talentpb/tenant_service.pb.go
+++ b/talent/apiv4/talentpb/tenant_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/talent/v4/tenant_service.proto
 
 package talentpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -170,7 +170,7 @@ type UpdateTenantRequest struct {
 	//
 	// A field mask to specify the tenant fields to be updated. Only
 	// top level fields of [Tenant][google.cloud.talent.v4.Tenant] are supported.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateTenantRequest) Reset() {
@@ -212,7 +212,7 @@ func (x *UpdateTenantRequest) GetTenant() *Tenant {
 	return nil
 }
 
-func (x *UpdateTenantRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTenantRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -564,16 +564,16 @@ func file_google_cloud_talent_v4_tenant_service_proto_rawDescGZIP() []byte {
 
 var file_google_cloud_talent_v4_tenant_service_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_google_cloud_talent_v4_tenant_service_proto_goTypes = []interface{}{
-	(*CreateTenantRequest)(nil),  // 0: google.cloud.talent.v4.CreateTenantRequest
-	(*GetTenantRequest)(nil),     // 1: google.cloud.talent.v4.GetTenantRequest
-	(*UpdateTenantRequest)(nil),  // 2: google.cloud.talent.v4.UpdateTenantRequest
-	(*DeleteTenantRequest)(nil),  // 3: google.cloud.talent.v4.DeleteTenantRequest
-	(*ListTenantsRequest)(nil),   // 4: google.cloud.talent.v4.ListTenantsRequest
-	(*ListTenantsResponse)(nil),  // 5: google.cloud.talent.v4.ListTenantsResponse
-	(*Tenant)(nil),               // 6: google.cloud.talent.v4.Tenant
-	(*field_mask.FieldMask)(nil), // 7: google.protobuf.FieldMask
-	(*ResponseMetadata)(nil),     // 8: google.cloud.talent.v4.ResponseMetadata
-	(*empty.Empty)(nil),          // 9: google.protobuf.Empty
+	(*CreateTenantRequest)(nil),   // 0: google.cloud.talent.v4.CreateTenantRequest
+	(*GetTenantRequest)(nil),      // 1: google.cloud.talent.v4.GetTenantRequest
+	(*UpdateTenantRequest)(nil),   // 2: google.cloud.talent.v4.UpdateTenantRequest
+	(*DeleteTenantRequest)(nil),   // 3: google.cloud.talent.v4.DeleteTenantRequest
+	(*ListTenantsRequest)(nil),    // 4: google.cloud.talent.v4.ListTenantsRequest
+	(*ListTenantsResponse)(nil),   // 5: google.cloud.talent.v4.ListTenantsResponse
+	(*Tenant)(nil),                // 6: google.cloud.talent.v4.Tenant
+	(*fieldmaskpb.FieldMask)(nil), // 7: google.protobuf.FieldMask
+	(*ResponseMetadata)(nil),      // 8: google.cloud.talent.v4.ResponseMetadata
+	(*emptypb.Empty)(nil),         // 9: google.protobuf.Empty
 }
 var file_google_cloud_talent_v4_tenant_service_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.talent.v4.CreateTenantRequest.tenant:type_name -> google.cloud.talent.v4.Tenant
@@ -718,7 +718,7 @@ type TenantServiceClient interface {
 	// Updates specified tenant.
 	UpdateTenant(ctx context.Context, in *UpdateTenantRequest, opts ...grpc.CallOption) (*Tenant, error)
 	// Deletes specified tenant.
-	DeleteTenant(ctx context.Context, in *DeleteTenantRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteTenant(ctx context.Context, in *DeleteTenantRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists all tenants associated with the project.
 	ListTenants(ctx context.Context, in *ListTenantsRequest, opts ...grpc.CallOption) (*ListTenantsResponse, error)
 }
@@ -758,8 +758,8 @@ func (c *tenantServiceClient) UpdateTenant(ctx context.Context, in *UpdateTenant
 	return out, nil
 }
 
-func (c *tenantServiceClient) DeleteTenant(ctx context.Context, in *DeleteTenantRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *tenantServiceClient) DeleteTenant(ctx context.Context, in *DeleteTenantRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.talent.v4.TenantService/DeleteTenant", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -785,7 +785,7 @@ type TenantServiceServer interface {
 	// Updates specified tenant.
 	UpdateTenant(context.Context, *UpdateTenantRequest) (*Tenant, error)
 	// Deletes specified tenant.
-	DeleteTenant(context.Context, *DeleteTenantRequest) (*empty.Empty, error)
+	DeleteTenant(context.Context, *DeleteTenantRequest) (*emptypb.Empty, error)
 	// Lists all tenants associated with the project.
 	ListTenants(context.Context, *ListTenantsRequest) (*ListTenantsResponse, error)
 }
@@ -803,7 +803,7 @@ func (*UnimplementedTenantServiceServer) GetTenant(context.Context, *GetTenantRe
 func (*UnimplementedTenantServiceServer) UpdateTenant(context.Context, *UpdateTenantRequest) (*Tenant, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateTenant not implemented")
 }
-func (*UnimplementedTenantServiceServer) DeleteTenant(context.Context, *DeleteTenantRequest) (*empty.Empty, error) {
+func (*UnimplementedTenantServiceServer) DeleteTenant(context.Context, *DeleteTenantRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteTenant not implemented")
 }
 func (*UnimplementedTenantServiceServer) ListTenants(context.Context, *ListTenantsRequest) (*ListTenantsResponse, error) {
diff --git a/talent/apiv4/tenant_client.go b/talent/apiv4/tenant_client.go
index f3f58e88278..bafa2e22a14 100644
--- a/talent/apiv4/tenant_client.go
+++ b/talent/apiv4/tenant_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/talent/apiv4/tenant_client_example_test.go b/talent/apiv4/tenant_client_example_test.go
index 9e062ae55b7..1b02c988ef8 100644
--- a/talent/apiv4/tenant_client_example_test.go
+++ b/talent/apiv4/tenant_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	talent "cloud.google.com/go/talent/apiv4"
+	talentpb "cloud.google.com/go/talent/apiv4/talentpb"
 	"google.golang.org/api/iterator"
-	talentpb "google.golang.org/genproto/googleapis/cloud/talent/v4"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -57,7 +57,7 @@ func ExampleTenantClient_CreateTenant() {
 
 	req := &talentpb.CreateTenantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#CreateTenantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#CreateTenantRequest.
 	}
 	resp, err := c.CreateTenant(ctx, req)
 	if err != nil {
@@ -82,7 +82,7 @@ func ExampleTenantClient_GetTenant() {
 
 	req := &talentpb.GetTenantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#GetTenantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#GetTenantRequest.
 	}
 	resp, err := c.GetTenant(ctx, req)
 	if err != nil {
@@ -107,7 +107,7 @@ func ExampleTenantClient_UpdateTenant() {
 
 	req := &talentpb.UpdateTenantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#UpdateTenantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#UpdateTenantRequest.
 	}
 	resp, err := c.UpdateTenant(ctx, req)
 	if err != nil {
@@ -132,7 +132,7 @@ func ExampleTenantClient_DeleteTenant() {
 
 	req := &talentpb.DeleteTenantRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#DeleteTenantRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#DeleteTenantRequest.
 	}
 	err = c.DeleteTenant(ctx, req)
 	if err != nil {
@@ -155,7 +155,7 @@ func ExampleTenantClient_ListTenants() {
 
 	req := &talentpb.ListTenantsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/talent/v4#ListTenantsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/talent/apiv4/talentpb#ListTenantsRequest.
 	}
 	it := c.ListTenants(ctx, req)
 	for {
diff --git a/talent/go.mod b/talent/go.mod
index 7cba1270051..254230e21bb 100644
--- a/talent/go.mod
+++ b/talent/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/talent
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/talent/go.sum b/talent/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/talent/go.sum
+++ b/talent/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/texttospeech/aliasshim/aliasshim.go b/texttospeech/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/texttospeech/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/texttospeech/apiv1/doc.go b/texttospeech/apiv1/doc.go
index 5332b68a7eb..9b0dd0f69ac 100644
--- a/texttospeech/apiv1/doc.go
+++ b/texttospeech/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &texttospeechpb.ListVoicesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/texttospeech/v1#ListVoicesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/texttospeech/apiv1/texttospeechpb#ListVoicesRequest.
 //	}
 //	resp, err := c.ListVoices(ctx, req)
 //	if err != nil {
diff --git a/texttospeech/apiv1/text_to_speech_client.go b/texttospeech/apiv1/text_to_speech_client.go
index f9b81004423..c203cc570f5 100644
--- a/texttospeech/apiv1/text_to_speech_client.go
+++ b/texttospeech/apiv1/text_to_speech_client.go
@@ -21,11 +21,11 @@ import (
 	"math"
 	"time"
 
+	texttospeechpb "cloud.google.com/go/texttospeech/apiv1/texttospeechpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	texttospeechpb "google.golang.org/genproto/googleapis/cloud/texttospeech/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/texttospeech/apiv1/text_to_speech_client_example_test.go b/texttospeech/apiv1/text_to_speech_client_example_test.go
index cf1b99f2b94..0a95844eb0c 100644
--- a/texttospeech/apiv1/text_to_speech_client_example_test.go
+++ b/texttospeech/apiv1/text_to_speech_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	texttospeech "cloud.google.com/go/texttospeech/apiv1"
-	texttospeechpb "google.golang.org/genproto/googleapis/cloud/texttospeech/v1"
+	texttospeechpb "cloud.google.com/go/texttospeech/apiv1/texttospeechpb"
 )
 
 func ExampleNewClient() {
@@ -55,7 +55,7 @@ func ExampleClient_ListVoices() {
 
 	req := &texttospeechpb.ListVoicesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/texttospeech/v1#ListVoicesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/texttospeech/apiv1/texttospeechpb#ListVoicesRequest.
 	}
 	resp, err := c.ListVoices(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleClient_SynthesizeSpeech() {
 
 	req := &texttospeechpb.SynthesizeSpeechRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/texttospeech/v1#SynthesizeSpeechRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/texttospeech/apiv1/texttospeechpb#SynthesizeSpeechRequest.
 	}
 	resp, err := c.SynthesizeSpeech(ctx, req)
 	if err != nil {
diff --git a/texttospeech/apiv1/texttospeechpb/cloud_tts.pb.go b/texttospeech/apiv1/texttospeechpb/cloud_tts.pb.go
index 2db7b883131..af7fcf20177 100644
--- a/texttospeech/apiv1/texttospeechpb/cloud_tts.pb.go
+++ b/texttospeech/apiv1/texttospeechpb/cloud_tts.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/texttospeech/v1/cloud_tts.proto
 
 package texttospeechpb
diff --git a/texttospeech/go.mod b/texttospeech/go.mod
index 6ea885efdc0..ad52fcd34e0 100644
--- a/texttospeech/go.mod
+++ b/texttospeech/go.mod
@@ -3,10 +3,10 @@ module cloud.google.com/go/texttospeech
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go v0.105.0
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -18,9 +18,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/texttospeech/go.sum b/texttospeech/go.sum
index 8784b2a0c77..9ebb2713a7a 100644
--- a/texttospeech/go.sum
+++ b/texttospeech/go.sum
@@ -1,8 +1,9 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -39,6 +40,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/tpu/aliasshim/aliasshim.go b/tpu/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/tpu/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/tpu/apiv1/doc.go b/tpu/apiv1/doc.go
index e4d1af7b3fb..6e3f9785e48 100644
--- a/tpu/apiv1/doc.go
+++ b/tpu/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &tpupb.ListNodesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#ListNodesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#ListNodesRequest.
 //	}
 //	it := c.ListNodes(ctx, req)
 //	for {
diff --git a/tpu/apiv1/tpu_client.go b/tpu/apiv1/tpu_client.go
index ca5008012cf..82464985623 100644
--- a/tpu/apiv1/tpu_client.go
+++ b/tpu/apiv1/tpu_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	tpupb "cloud.google.com/go/tpu/apiv1/tpupb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	tpupb "google.golang.org/genproto/googleapis/cloud/tpu/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/tpu/apiv1/tpu_client_example_test.go b/tpu/apiv1/tpu_client_example_test.go
index 0234cb805f4..02192d945dc 100644
--- a/tpu/apiv1/tpu_client_example_test.go
+++ b/tpu/apiv1/tpu_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	tpu "cloud.google.com/go/tpu/apiv1"
+	tpupb "cloud.google.com/go/tpu/apiv1/tpupb"
 	"google.golang.org/api/iterator"
-	tpupb "google.golang.org/genproto/googleapis/cloud/tpu/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListNodes() {
 
 	req := &tpupb.ListNodesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#ListNodesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#ListNodesRequest.
 	}
 	it := c.ListNodes(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetNode() {
 
 	req := &tpupb.GetNodeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#GetNodeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#GetNodeRequest.
 	}
 	resp, err := c.GetNode(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_CreateNode() {
 
 	req := &tpupb.CreateNodeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#CreateNodeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#CreateNodeRequest.
 	}
 	op, err := c.CreateNode(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleClient_DeleteNode() {
 
 	req := &tpupb.DeleteNodeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#DeleteNodeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#DeleteNodeRequest.
 	}
 	op, err := c.DeleteNode(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleClient_ReimageNode() {
 
 	req := &tpupb.ReimageNodeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#ReimageNodeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#ReimageNodeRequest.
 	}
 	op, err := c.ReimageNode(ctx, req)
 	if err != nil {
@@ -202,7 +202,7 @@ func ExampleClient_StopNode() {
 
 	req := &tpupb.StopNodeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#StopNodeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#StopNodeRequest.
 	}
 	op, err := c.StopNode(ctx, req)
 	if err != nil {
@@ -232,7 +232,7 @@ func ExampleClient_StartNode() {
 
 	req := &tpupb.StartNodeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#StartNodeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#StartNodeRequest.
 	}
 	op, err := c.StartNode(ctx, req)
 	if err != nil {
@@ -262,7 +262,7 @@ func ExampleClient_ListTensorFlowVersions() {
 
 	req := &tpupb.ListTensorFlowVersionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#ListTensorFlowVersionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#ListTensorFlowVersionsRequest.
 	}
 	it := c.ListTensorFlowVersions(ctx, req)
 	for {
@@ -293,7 +293,7 @@ func ExampleClient_GetTensorFlowVersion() {
 
 	req := &tpupb.GetTensorFlowVersionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#GetTensorFlowVersionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#GetTensorFlowVersionRequest.
 	}
 	resp, err := c.GetTensorFlowVersion(ctx, req)
 	if err != nil {
@@ -318,7 +318,7 @@ func ExampleClient_ListAcceleratorTypes() {
 
 	req := &tpupb.ListAcceleratorTypesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#ListAcceleratorTypesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#ListAcceleratorTypesRequest.
 	}
 	it := c.ListAcceleratorTypes(ctx, req)
 	for {
@@ -349,7 +349,7 @@ func ExampleClient_GetAcceleratorType() {
 
 	req := &tpupb.GetAcceleratorTypeRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tpu/v1#GetAcceleratorTypeRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/tpu/apiv1/tpupb#GetAcceleratorTypeRequest.
 	}
 	resp, err := c.GetAcceleratorType(ctx, req)
 	if err != nil {
diff --git a/tpu/apiv1/tpupb/cloud_tpu.pb.go b/tpu/apiv1/tpupb/cloud_tpu.pb.go
index 1ccc659da8c..600629ff0b3 100644
--- a/tpu/apiv1/tpupb/cloud_tpu.pb.go
+++ b/tpu/apiv1/tpupb/cloud_tpu.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/tpu/v1/cloud_tpu.proto
 
 package tpupb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -505,7 +505,7 @@ type Node struct {
 	// that data.
 	ServiceAccount string `protobuf:"bytes,15,opt,name=service_account,json=serviceAccount,proto3" json:"service_account,omitempty"`
 	// Output only. The time when the node was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,16,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The scheduling options for this node.
 	SchedulingConfig *SchedulingConfig `protobuf:"bytes,17,opt,name=scheduling_config,json=schedulingConfig,proto3" json:"scheduling_config,omitempty"`
 	// Output only. The network endpoints where TPU workers can be accessed and
@@ -639,7 +639,7 @@ func (x *Node) GetServiceAccount() string {
 	return ""
 }
 
-func (x *Node) GetCreateTime() *timestamp.Timestamp {
+func (x *Node) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -1675,9 +1675,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Target of the operation - for example
 	// projects/project-1/connectivityTests/test-1
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
@@ -1723,14 +1723,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_tpu_v1_cloud_tpu_proto_rawDescGZIP(), []int{19}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1779,7 +1779,7 @@ type Symptom struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Timestamp when the Symptom is created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Type of the Symptom.
 	SymptomType Symptom_SymptomType `protobuf:"varint,2,opt,name=symptom_type,json=symptomType,proto3,enum=google.cloud.tpu.v1.Symptom_SymptomType" json:"symptom_type,omitempty"`
 	// Detailed information of the current Symptom.
@@ -1820,7 +1820,7 @@ func (*Symptom) Descriptor() ([]byte, []int) {
 	return file_google_cloud_tpu_v1_cloud_tpu_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *Symptom) GetCreateTime() *timestamp.Timestamp {
+func (x *Symptom) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -2326,7 +2326,7 @@ var file_google_cloud_tpu_v1_cloud_tpu_proto_goTypes = []interface{}{
 	(*OperationMetadata)(nil),              // 23: google.cloud.tpu.v1.OperationMetadata
 	(*Symptom)(nil),                        // 24: google.cloud.tpu.v1.Symptom
 	nil,                                    // 25: google.cloud.tpu.v1.Node.LabelsEntry
-	(*timestamp.Timestamp)(nil),            // 26: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 26: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),          // 27: google.longrunning.Operation
 }
 var file_google_cloud_tpu_v1_cloud_tpu_proto_depIdxs = []int32{
diff --git a/tpu/go.mod b/tpu/go.mod
index a01f6569c1e..579179618a4 100644
--- a/tpu/go.mod
+++ b/tpu/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/tpu
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/tpu/go.sum b/tpu/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/tpu/go.sum
+++ b/tpu/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/trace/aliasshim/aliasshim.go b/trace/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/trace/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/trace/apiv1/doc.go b/trace/apiv1/doc.go
index 930097a9ac1..e696eb0b347 100644
--- a/trace/apiv1/doc.go
+++ b/trace/apiv1/doc.go
@@ -59,9 +59,9 @@
 //	}
 //	defer c.Close()
 //
-//	req := &cloudtracepb.ListTracesRequest{
+//	req := &tracepb.ListTracesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudtrace/v1#ListTracesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/trace/apiv1/tracepb#ListTracesRequest.
 //	}
 //	it := c.ListTraces(ctx, req)
 //	for {
diff --git a/trace/apiv1/trace_client.go b/trace/apiv1/trace_client.go
index 7dbd800fae2..cf1a8f45377 100644
--- a/trace/apiv1/trace_client.go
+++ b/trace/apiv1/trace_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	tracepb "cloud.google.com/go/trace/apiv1/tracepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
@@ -102,9 +102,9 @@ type internalClient interface {
 	Close() error
 	setGoogleClientInfo(...string)
 	Connection() *grpc.ClientConn
-	ListTraces(context.Context, *cloudtracepb.ListTracesRequest, ...gax.CallOption) *TraceIterator
-	GetTrace(context.Context, *cloudtracepb.GetTraceRequest, ...gax.CallOption) (*cloudtracepb.Trace, error)
-	PatchTraces(context.Context, *cloudtracepb.PatchTracesRequest, ...gax.CallOption) error
+	ListTraces(context.Context, *tracepb.ListTracesRequest, ...gax.CallOption) *TraceIterator
+	GetTrace(context.Context, *tracepb.GetTraceRequest, ...gax.CallOption) (*tracepb.Trace, error)
+	PatchTraces(context.Context, *tracepb.PatchTracesRequest, ...gax.CallOption) error
 }
 
 // Client is a client for interacting with Stackdriver Trace API.
@@ -147,12 +147,12 @@ func (c *Client) Connection() *grpc.ClientConn {
 }
 
 // ListTraces returns of a list of traces that match the specified filter conditions.
-func (c *Client) ListTraces(ctx context.Context, req *cloudtracepb.ListTracesRequest, opts ...gax.CallOption) *TraceIterator {
+func (c *Client) ListTraces(ctx context.Context, req *tracepb.ListTracesRequest, opts ...gax.CallOption) *TraceIterator {
 	return c.internalClient.ListTraces(ctx, req, opts...)
 }
 
 // GetTrace gets a single trace by its ID.
-func (c *Client) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceRequest, opts ...gax.CallOption) (*cloudtracepb.Trace, error) {
+func (c *Client) GetTrace(ctx context.Context, req *tracepb.GetTraceRequest, opts ...gax.CallOption) (*tracepb.Trace, error) {
 	return c.internalClient.GetTrace(ctx, req, opts...)
 }
 
@@ -161,7 +161,7 @@ func (c *Client) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceRequest
 // in the existing trace and its spans are overwritten by the provided values,
 // and any new fields provided are merged with the existing trace data. If the
 // ID does not match, a new trace is created.
-func (c *Client) PatchTraces(ctx context.Context, req *cloudtracepb.PatchTracesRequest, opts ...gax.CallOption) error {
+func (c *Client) PatchTraces(ctx context.Context, req *tracepb.PatchTracesRequest, opts ...gax.CallOption) error {
 	return c.internalClient.PatchTraces(ctx, req, opts...)
 }
 
@@ -179,7 +179,7 @@ type gRPCClient struct {
 	CallOptions **CallOptions
 
 	// The gRPC API client.
-	client cloudtracepb.TraceServiceClient
+	client tracepb.TraceServiceClient
 
 	// The x-goog-* metadata to be sent with each request.
 	xGoogMetadata metadata.MD
@@ -217,7 +217,7 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
 	c := &gRPCClient{
 		connPool:         connPool,
 		disableDeadlines: disableDeadlines,
-		client:           cloudtracepb.NewTraceServiceClient(connPool),
+		client:           tracepb.NewTraceServiceClient(connPool),
 		CallOptions:      &client.CallOptions,
 	}
 	c.setGoogleClientInfo()
@@ -250,15 +250,15 @@ func (c *gRPCClient) Close() error {
 	return c.connPool.Close()
 }
 
-func (c *gRPCClient) ListTraces(ctx context.Context, req *cloudtracepb.ListTracesRequest, opts ...gax.CallOption) *TraceIterator {
+func (c *gRPCClient) ListTraces(ctx context.Context, req *tracepb.ListTracesRequest, opts ...gax.CallOption) *TraceIterator {
 	md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "project_id", url.QueryEscape(req.GetProjectId())))
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).ListTraces[0:len((*c.CallOptions).ListTraces):len((*c.CallOptions).ListTraces)], opts...)
 	it := &TraceIterator{}
-	req = proto.Clone(req).(*cloudtracepb.ListTracesRequest)
-	it.InternalFetch = func(pageSize int, pageToken string) ([]*cloudtracepb.Trace, string, error) {
-		resp := &cloudtracepb.ListTracesResponse{}
+	req = proto.Clone(req).(*tracepb.ListTracesRequest)
+	it.InternalFetch = func(pageSize int, pageToken string) ([]*tracepb.Trace, string, error) {
+		resp := &tracepb.ListTracesResponse{}
 		if pageToken != "" {
 			req.PageToken = pageToken
 		}
@@ -295,7 +295,7 @@ func (c *gRPCClient) ListTraces(ctx context.Context, req *cloudtracepb.ListTrace
 	return it
 }
 
-func (c *gRPCClient) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceRequest, opts ...gax.CallOption) (*cloudtracepb.Trace, error) {
+func (c *gRPCClient) GetTrace(ctx context.Context, req *tracepb.GetTraceRequest, opts ...gax.CallOption) (*tracepb.Trace, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 45000*time.Millisecond)
 		defer cancel()
@@ -305,7 +305,7 @@ func (c *gRPCClient) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceReq
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).GetTrace[0:len((*c.CallOptions).GetTrace):len((*c.CallOptions).GetTrace)], opts...)
-	var resp *cloudtracepb.Trace
+	var resp *tracepb.Trace
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.GetTrace(ctx, req, settings.GRPC...)
@@ -317,7 +317,7 @@ func (c *gRPCClient) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceReq
 	return resp, nil
 }
 
-func (c *gRPCClient) PatchTraces(ctx context.Context, req *cloudtracepb.PatchTracesRequest, opts ...gax.CallOption) error {
+func (c *gRPCClient) PatchTraces(ctx context.Context, req *tracepb.PatchTracesRequest, opts ...gax.CallOption) error {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 45000*time.Millisecond)
 		defer cancel()
@@ -335,9 +335,9 @@ func (c *gRPCClient) PatchTraces(ctx context.Context, req *cloudtracepb.PatchTra
 	return err
 }
 
-// TraceIterator manages a stream of *cloudtracepb.Trace.
+// TraceIterator manages a stream of *tracepb.Trace.
 type TraceIterator struct {
-	items    []*cloudtracepb.Trace
+	items    []*tracepb.Trace
 	pageInfo *iterator.PageInfo
 	nextFunc func() error
 
@@ -352,7 +352,7 @@ type TraceIterator struct {
 	// InternalFetch returns results from a single call to the underlying RPC.
 	// The number of results is no greater than pageSize.
 	// If there are no more results, nextPageToken is empty and err is nil.
-	InternalFetch func(pageSize int, pageToken string) (results []*cloudtracepb.Trace, nextPageToken string, err error)
+	InternalFetch func(pageSize int, pageToken string) (results []*tracepb.Trace, nextPageToken string, err error)
 }
 
 // PageInfo supports pagination. See the google.golang.org/api/iterator package for details.
@@ -362,8 +362,8 @@ func (it *TraceIterator) PageInfo() *iterator.PageInfo {
 
 // Next returns the next result. Its second return value is iterator.Done if there are no more
 // results. Once Next returns Done, all subsequent calls will return Done.
-func (it *TraceIterator) Next() (*cloudtracepb.Trace, error) {
-	var item *cloudtracepb.Trace
+func (it *TraceIterator) Next() (*tracepb.Trace, error) {
+	var item *tracepb.Trace
 	if err := it.nextFunc(); err != nil {
 		return item, err
 	}
diff --git a/trace/apiv1/trace_client_example_test.go b/trace/apiv1/trace_client_example_test.go
index ed8baade77e..fa292d8f8dd 100644
--- a/trace/apiv1/trace_client_example_test.go
+++ b/trace/apiv1/trace_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	trace "cloud.google.com/go/trace/apiv1"
+	tracepb "cloud.google.com/go/trace/apiv1/tracepb"
 	"google.golang.org/api/iterator"
-	cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
 )
 
 func ExampleNewClient() {
@@ -54,9 +54,9 @@ func ExampleClient_ListTraces() {
 	}
 	defer c.Close()
 
-	req := &cloudtracepb.ListTracesRequest{
+	req := &tracepb.ListTracesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudtrace/v1#ListTracesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/trace/apiv1/tracepb#ListTracesRequest.
 	}
 	it := c.ListTraces(ctx, req)
 	for {
@@ -85,9 +85,9 @@ func ExampleClient_GetTrace() {
 	}
 	defer c.Close()
 
-	req := &cloudtracepb.GetTraceRequest{
+	req := &tracepb.GetTraceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudtrace/v1#GetTraceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/trace/apiv1/tracepb#GetTraceRequest.
 	}
 	resp, err := c.GetTrace(ctx, req)
 	if err != nil {
@@ -110,9 +110,9 @@ func ExampleClient_PatchTraces() {
 	}
 	defer c.Close()
 
-	req := &cloudtracepb.PatchTracesRequest{
+	req := &tracepb.PatchTracesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudtrace/v1#PatchTracesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/trace/apiv1/tracepb#PatchTracesRequest.
 	}
 	err = c.PatchTraces(ctx, req)
 	if err != nil {
diff --git a/trace/apiv1/tracepb/trace.pb.go b/trace/apiv1/tracepb/trace.pb.go
index 7d320b0b1b1..5c1ec8b7006 100644
--- a/trace/apiv1/tracepb/trace.pb.go
+++ b/trace/apiv1/tracepb/trace.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/cloudtrace/v1/trace.proto
 
 package tracepb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -305,9 +305,9 @@ type TraceSpan struct {
 	// cross-trace spans.
 	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// Start time of the span in nanoseconds from the UNIX epoch.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End time of the span in nanoseconds from the UNIX epoch.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Optional. ID of the parent span, if any.
 	ParentSpanId uint64 `protobuf:"fixed64,6,opt,name=parent_span_id,json=parentSpanId,proto3" json:"parent_span_id,omitempty"`
 	// Collection of labels associated with the span. Label keys must be less than
@@ -401,14 +401,14 @@ func (x *TraceSpan) GetName() string {
 	return ""
 }
 
-func (x *TraceSpan) GetStartTime() *timestamp.Timestamp {
+func (x *TraceSpan) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *TraceSpan) GetEndTime() *timestamp.Timestamp {
+func (x *TraceSpan) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -450,10 +450,10 @@ type ListTracesRequest struct {
 	PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
 	// Start of the time interval (inclusive) during which the trace data was
 	// collected from the application.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// End of the time interval (inclusive) during which the trace data was
 	// collected from the application.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Optional. A filter against labels for the request.
 	//
 	// By default, searches use prefix matching. To specify exact match, prepend
@@ -561,14 +561,14 @@ func (x *ListTracesRequest) GetPageToken() string {
 	return ""
 }
 
-func (x *ListTracesRequest) GetStartTime() *timestamp.Timestamp {
+func (x *ListTracesRequest) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *ListTracesRequest) GetEndTime() *timestamp.Timestamp {
+func (x *ListTracesRequest) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -960,8 +960,8 @@ var file_google_devtools_cloudtrace_v1_trace_proto_goTypes = []interface{}{
 	(*GetTraceRequest)(nil),         // 7: google.devtools.cloudtrace.v1.GetTraceRequest
 	(*PatchTracesRequest)(nil),      // 8: google.devtools.cloudtrace.v1.PatchTracesRequest
 	nil,                             // 9: google.devtools.cloudtrace.v1.TraceSpan.LabelsEntry
-	(*timestamp.Timestamp)(nil),     // 10: google.protobuf.Timestamp
-	(*empty.Empty)(nil),             // 11: google.protobuf.Empty
+	(*timestamppb.Timestamp)(nil),   // 10: google.protobuf.Timestamp
+	(*emptypb.Empty)(nil),           // 11: google.protobuf.Empty
 }
 var file_google_devtools_cloudtrace_v1_trace_proto_depIdxs = []int32{
 	4,  // 0: google.devtools.cloudtrace.v1.Trace.spans:type_name -> google.devtools.cloudtrace.v1.TraceSpan
@@ -1121,7 +1121,7 @@ type TraceServiceClient interface {
 	// in the existing trace and its spans are overwritten by the provided values,
 	// and any new fields provided are merged with the existing trace data. If the
 	// ID does not match, a new trace is created.
-	PatchTraces(ctx context.Context, in *PatchTracesRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	PatchTraces(ctx context.Context, in *PatchTracesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type traceServiceClient struct {
@@ -1150,8 +1150,8 @@ func (c *traceServiceClient) GetTrace(ctx context.Context, in *GetTraceRequest,
 	return out, nil
 }
 
-func (c *traceServiceClient) PatchTraces(ctx context.Context, in *PatchTracesRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *traceServiceClient) PatchTraces(ctx context.Context, in *PatchTracesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.devtools.cloudtrace.v1.TraceService/PatchTraces", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1170,7 +1170,7 @@ type TraceServiceServer interface {
 	// in the existing trace and its spans are overwritten by the provided values,
 	// and any new fields provided are merged with the existing trace data. If the
 	// ID does not match, a new trace is created.
-	PatchTraces(context.Context, *PatchTracesRequest) (*empty.Empty, error)
+	PatchTraces(context.Context, *PatchTracesRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedTraceServiceServer can be embedded to have forward compatible implementations.
@@ -1183,7 +1183,7 @@ func (*UnimplementedTraceServiceServer) ListTraces(context.Context, *ListTracesR
 func (*UnimplementedTraceServiceServer) GetTrace(context.Context, *GetTraceRequest) (*Trace, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetTrace not implemented")
 }
-func (*UnimplementedTraceServiceServer) PatchTraces(context.Context, *PatchTracesRequest) (*empty.Empty, error) {
+func (*UnimplementedTraceServiceServer) PatchTraces(context.Context, *PatchTracesRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method PatchTraces not implemented")
 }
 
diff --git a/trace/apiv2/doc.go b/trace/apiv2/doc.go
index 5c67c10369e..b36528c9be0 100644
--- a/trace/apiv2/doc.go
+++ b/trace/apiv2/doc.go
@@ -59,9 +59,9 @@
 //	}
 //	defer c.Close()
 //
-//	req := &cloudtracepb.BatchWriteSpansRequest{
+//	req := &tracepb.BatchWriteSpansRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2#BatchWriteSpansRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/trace/apiv2/tracepb#BatchWriteSpansRequest.
 //	}
 //	err = c.BatchWriteSpans(ctx, req)
 //	if err != nil {
diff --git a/trace/apiv2/trace_client.go b/trace/apiv2/trace_client.go
index 8738ab66a6c..6b803f9d0c4 100644
--- a/trace/apiv2/trace_client.go
+++ b/trace/apiv2/trace_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	tracepb "cloud.google.com/go/trace/apiv2/tracepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
@@ -76,8 +76,8 @@ type internalClient interface {
 	Close() error
 	setGoogleClientInfo(...string)
 	Connection() *grpc.ClientConn
-	BatchWriteSpans(context.Context, *cloudtracepb.BatchWriteSpansRequest, ...gax.CallOption) error
-	CreateSpan(context.Context, *cloudtracepb.Span, ...gax.CallOption) (*cloudtracepb.Span, error)
+	BatchWriteSpans(context.Context, *tracepb.BatchWriteSpansRequest, ...gax.CallOption) error
+	CreateSpan(context.Context, *tracepb.Span, ...gax.CallOption) (*tracepb.Span, error)
 }
 
 // Client is a client for interacting with Stackdriver Trace API.
@@ -121,12 +121,12 @@ func (c *Client) Connection() *grpc.ClientConn {
 
 // BatchWriteSpans sends new spans to new or existing traces. You cannot update
 // existing spans.
-func (c *Client) BatchWriteSpans(ctx context.Context, req *cloudtracepb.BatchWriteSpansRequest, opts ...gax.CallOption) error {
+func (c *Client) BatchWriteSpans(ctx context.Context, req *tracepb.BatchWriteSpansRequest, opts ...gax.CallOption) error {
 	return c.internalClient.BatchWriteSpans(ctx, req, opts...)
 }
 
 // CreateSpan creates a new span.
-func (c *Client) CreateSpan(ctx context.Context, req *cloudtracepb.Span, opts ...gax.CallOption) (*cloudtracepb.Span, error) {
+func (c *Client) CreateSpan(ctx context.Context, req *tracepb.Span, opts ...gax.CallOption) (*tracepb.Span, error) {
 	return c.internalClient.CreateSpan(ctx, req, opts...)
 }
 
@@ -144,7 +144,7 @@ type gRPCClient struct {
 	CallOptions **CallOptions
 
 	// The gRPC API client.
-	client cloudtracepb.TraceServiceClient
+	client tracepb.TraceServiceClient
 
 	// The x-goog-* metadata to be sent with each request.
 	xGoogMetadata metadata.MD
@@ -182,7 +182,7 @@ func NewClient(ctx context.Context, opts ...option.ClientOption) (*Client, error
 	c := &gRPCClient{
 		connPool:         connPool,
 		disableDeadlines: disableDeadlines,
-		client:           cloudtracepb.NewTraceServiceClient(connPool),
+		client:           tracepb.NewTraceServiceClient(connPool),
 		CallOptions:      &client.CallOptions,
 	}
 	c.setGoogleClientInfo()
@@ -215,7 +215,7 @@ func (c *gRPCClient) Close() error {
 	return c.connPool.Close()
 }
 
-func (c *gRPCClient) BatchWriteSpans(ctx context.Context, req *cloudtracepb.BatchWriteSpansRequest, opts ...gax.CallOption) error {
+func (c *gRPCClient) BatchWriteSpans(ctx context.Context, req *tracepb.BatchWriteSpansRequest, opts ...gax.CallOption) error {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 120000*time.Millisecond)
 		defer cancel()
@@ -233,7 +233,7 @@ func (c *gRPCClient) BatchWriteSpans(ctx context.Context, req *cloudtracepb.Batc
 	return err
 }
 
-func (c *gRPCClient) CreateSpan(ctx context.Context, req *cloudtracepb.Span, opts ...gax.CallOption) (*cloudtracepb.Span, error) {
+func (c *gRPCClient) CreateSpan(ctx context.Context, req *tracepb.Span, opts ...gax.CallOption) (*tracepb.Span, error) {
 	if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
 		cctx, cancel := context.WithTimeout(ctx, 120000*time.Millisecond)
 		defer cancel()
@@ -243,7 +243,7 @@ func (c *gRPCClient) CreateSpan(ctx context.Context, req *cloudtracepb.Span, opt
 
 	ctx = insertMetadata(ctx, c.xGoogMetadata, md)
 	opts = append((*c.CallOptions).CreateSpan[0:len((*c.CallOptions).CreateSpan):len((*c.CallOptions).CreateSpan)], opts...)
-	var resp *cloudtracepb.Span
+	var resp *tracepb.Span
 	err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
 		var err error
 		resp, err = c.client.CreateSpan(ctx, req, settings.GRPC...)
diff --git a/trace/apiv2/trace_client_example_test.go b/trace/apiv2/trace_client_example_test.go
index 4df656eecc4..50b50eef4e1 100644
--- a/trace/apiv2/trace_client_example_test.go
+++ b/trace/apiv2/trace_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	trace "cloud.google.com/go/trace/apiv2"
-	cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
+	tracepb "cloud.google.com/go/trace/apiv2/tracepb"
 )
 
 func ExampleNewClient() {
@@ -53,9 +53,9 @@ func ExampleClient_BatchWriteSpans() {
 	}
 	defer c.Close()
 
-	req := &cloudtracepb.BatchWriteSpansRequest{
+	req := &tracepb.BatchWriteSpansRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2#BatchWriteSpansRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/trace/apiv2/tracepb#BatchWriteSpansRequest.
 	}
 	err = c.BatchWriteSpans(ctx, req)
 	if err != nil {
@@ -76,9 +76,9 @@ func ExampleClient_CreateSpan() {
 	}
 	defer c.Close()
 
-	req := &cloudtracepb.Span{
+	req := &tracepb.Span{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/devtools/cloudtrace/v2#Span.
+		// See https://pkg.go.dev/cloud.google.com/go/trace/apiv2/tracepb#Span.
 	}
 	resp, err := c.CreateSpan(ctx, req)
 	if err != nil {
diff --git a/trace/apiv2/tracepb/trace.pb.go b/trace/apiv2/tracepb/trace.pb.go
index 68a19c60f02..d0b06738232 100644
--- a/trace/apiv2/tracepb/trace.pb.go
+++ b/trace/apiv2/tracepb/trace.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/cloudtrace/v2/trace.proto
 
 package tracepb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	wrapperspb "google.golang.org/protobuf/types/known/wrapperspb"
 )
 
 const (
@@ -258,11 +258,11 @@ type Span struct {
 	// Required. The start time of the span. On the client side, this is the time kept by
 	// the local machine where the span execution starts. On the server side, this
 	// is the time when the server's application handler starts running.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Required. The end time of the span. On the client side, this is the time kept by
 	// the local machine where the span execution ends. On the server side, this
 	// is the time when the server application handler stops running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// A set of attributes on the span. You can have up to 32 attributes per
 	// span.
 	Attributes *Span_Attributes `protobuf:"bytes,7,opt,name=attributes,proto3" json:"attributes,omitempty"`
@@ -279,10 +279,10 @@ type Span struct {
 	// the same process as its parent. If you do not set this parameter,
 	// Stackdriver Trace is unable to take advantage of this helpful
 	// information.
-	SameProcessAsParentSpan *wrappers.BoolValue `protobuf:"bytes,12,opt,name=same_process_as_parent_span,json=sameProcessAsParentSpan,proto3" json:"same_process_as_parent_span,omitempty"`
+	SameProcessAsParentSpan *wrapperspb.BoolValue `protobuf:"bytes,12,opt,name=same_process_as_parent_span,json=sameProcessAsParentSpan,proto3" json:"same_process_as_parent_span,omitempty"`
 	// Optional. The number of child spans that were generated while this span
 	// was active. If set, allows implementation to detect missing child spans.
-	ChildSpanCount *wrappers.Int32Value `protobuf:"bytes,13,opt,name=child_span_count,json=childSpanCount,proto3" json:"child_span_count,omitempty"`
+	ChildSpanCount *wrapperspb.Int32Value `protobuf:"bytes,13,opt,name=child_span_count,json=childSpanCount,proto3" json:"child_span_count,omitempty"`
 	// Optional. Distinguishes between spans generated in a particular context. For example,
 	// two spans with the same name may be distinguished using `CLIENT` (caller)
 	// and `SERVER` (callee) to identify an RPC call.
@@ -349,14 +349,14 @@ func (x *Span) GetDisplayName() *TruncatableString {
 	return nil
 }
 
-func (x *Span) GetStartTime() *timestamp.Timestamp {
+func (x *Span) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Span) GetEndTime() *timestamp.Timestamp {
+func (x *Span) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -398,14 +398,14 @@ func (x *Span) GetStatus() *status.Status {
 	return nil
 }
 
-func (x *Span) GetSameProcessAsParentSpan() *wrappers.BoolValue {
+func (x *Span) GetSameProcessAsParentSpan() *wrapperspb.BoolValue {
 	if x != nil {
 		return x.SameProcessAsParentSpan
 	}
 	return nil
 }
 
-func (x *Span) GetChildSpanCount() *wrappers.Int32Value {
+func (x *Span) GetChildSpanCount() *wrapperspb.Int32Value {
 	if x != nil {
 		return x.ChildSpanCount
 	}
@@ -784,7 +784,7 @@ type Span_TimeEvent struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The timestamp indicating the time the event occurred.
-	Time *timestamp.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
+	Time *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"`
 	// A `TimeEvent` can contain either an `Annotation` object or a
 	// `MessageEvent` object, but not both.
 	//
@@ -827,7 +827,7 @@ func (*Span_TimeEvent) Descriptor() ([]byte, []int) {
 	return file_google_devtools_cloudtrace_v2_trace_proto_rawDescGZIP(), []int{0, 1}
 }
 
-func (x *Span_TimeEvent) GetTime() *timestamp.Timestamp {
+func (x *Span_TimeEvent) GetTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.Time
 	}
@@ -1706,10 +1706,10 @@ var file_google_devtools_cloudtrace_v2_trace_proto_goTypes = []interface{}{
 	(*Span_TimeEvent_MessageEvent)(nil),   // 15: google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent
 	(*StackTrace_StackFrame)(nil),         // 16: google.devtools.cloudtrace.v2.StackTrace.StackFrame
 	(*StackTrace_StackFrames)(nil),        // 17: google.devtools.cloudtrace.v2.StackTrace.StackFrames
-	(*timestamp.Timestamp)(nil),           // 18: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),         // 18: google.protobuf.Timestamp
 	(*status.Status)(nil),                 // 19: google.rpc.Status
-	(*wrappers.BoolValue)(nil),            // 20: google.protobuf.BoolValue
-	(*wrappers.Int32Value)(nil),           // 21: google.protobuf.Int32Value
+	(*wrapperspb.BoolValue)(nil),          // 20: google.protobuf.BoolValue
+	(*wrapperspb.Int32Value)(nil),         // 21: google.protobuf.Int32Value
 }
 var file_google_devtools_cloudtrace_v2_trace_proto_depIdxs = []int32{
 	7,  // 0: google.devtools.cloudtrace.v2.Span.display_name:type_name -> google.devtools.cloudtrace.v2.TruncatableString
diff --git a/trace/apiv2/tracepb/tracing.pb.go b/trace/apiv2/tracepb/tracing.pb.go
index 9401ef30373..604153c5792 100644
--- a/trace/apiv2/tracepb/tracing.pb.go
+++ b/trace/apiv2/tracepb/tracing.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/devtools/cloudtrace/v2/tracing.proto
 
 package tracepb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -190,7 +190,7 @@ var file_google_devtools_cloudtrace_v2_tracing_proto_msgTypes = make([]protoimpl
 var file_google_devtools_cloudtrace_v2_tracing_proto_goTypes = []interface{}{
 	(*BatchWriteSpansRequest)(nil), // 0: google.devtools.cloudtrace.v2.BatchWriteSpansRequest
 	(*Span)(nil),                   // 1: google.devtools.cloudtrace.v2.Span
-	(*empty.Empty)(nil),            // 2: google.protobuf.Empty
+	(*emptypb.Empty)(nil),          // 2: google.protobuf.Empty
 }
 var file_google_devtools_cloudtrace_v2_tracing_proto_depIdxs = []int32{
 	1, // 0: google.devtools.cloudtrace.v2.BatchWriteSpansRequest.spans:type_name -> google.devtools.cloudtrace.v2.Span
@@ -259,7 +259,7 @@ const _ = grpc.SupportPackageIsVersion6
 type TraceServiceClient interface {
 	// Sends new spans to new or existing traces. You cannot update
 	// existing spans.
-	BatchWriteSpans(ctx context.Context, in *BatchWriteSpansRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	BatchWriteSpans(ctx context.Context, in *BatchWriteSpansRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates a new span.
 	CreateSpan(ctx context.Context, in *Span, opts ...grpc.CallOption) (*Span, error)
 }
@@ -272,8 +272,8 @@ func NewTraceServiceClient(cc grpc.ClientConnInterface) TraceServiceClient {
 	return &traceServiceClient{cc}
 }
 
-func (c *traceServiceClient) BatchWriteSpans(ctx context.Context, in *BatchWriteSpansRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *traceServiceClient) BatchWriteSpans(ctx context.Context, in *BatchWriteSpansRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.devtools.cloudtrace.v2.TraceService/BatchWriteSpans", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -294,7 +294,7 @@ func (c *traceServiceClient) CreateSpan(ctx context.Context, in *Span, opts ...g
 type TraceServiceServer interface {
 	// Sends new spans to new or existing traces. You cannot update
 	// existing spans.
-	BatchWriteSpans(context.Context, *BatchWriteSpansRequest) (*empty.Empty, error)
+	BatchWriteSpans(context.Context, *BatchWriteSpansRequest) (*emptypb.Empty, error)
 	// Creates a new span.
 	CreateSpan(context.Context, *Span) (*Span, error)
 }
@@ -303,7 +303,7 @@ type TraceServiceServer interface {
 type UnimplementedTraceServiceServer struct {
 }
 
-func (*UnimplementedTraceServiceServer) BatchWriteSpans(context.Context, *BatchWriteSpansRequest) (*empty.Empty, error) {
+func (*UnimplementedTraceServiceServer) BatchWriteSpans(context.Context, *BatchWriteSpansRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method BatchWriteSpans not implemented")
 }
 func (*UnimplementedTraceServiceServer) CreateSpan(context.Context, *Span) (*Span, error) {
diff --git a/trace/go.mod b/trace/go.mod
index e351fa96590..3d85d2eaff0 100644
--- a/trace/go.mod
+++ b/trace/go.mod
@@ -3,11 +3,10 @@ module cloud.google.com/go/trace
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go v0.105.0
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -15,12 +14,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/trace/go.sum b/trace/go.sum
index 8784b2a0c77..9ebb2713a7a 100644
--- a/trace/go.sum
+++ b/trace/go.sum
@@ -1,8 +1,9 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -39,6 +40,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/translate/aliasshim/aliasshim.go b/translate/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/translate/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/translate/apiv3/doc.go b/translate/apiv3/doc.go
index 84b86b61a14..6c8bf1c30c5 100644
--- a/translate/apiv3/doc.go
+++ b/translate/apiv3/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &translatepb.TranslateTextRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#TranslateTextRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#TranslateTextRequest.
 //	}
 //	resp, err := c.TranslateText(ctx, req)
 //	if err != nil {
diff --git a/translate/apiv3/translatepb/translation_service.pb.go b/translate/apiv3/translatepb/translation_service.pb.go
index c3d2b3aa977..32a51e4daa5 100644
--- a/translate/apiv3/translatepb/translation_service.pb.go
+++ b/translate/apiv3/translatepb/translation_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/translate/v3/translation_service.proto
 
 package translatepb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -2218,7 +2218,7 @@ type BatchTranslateMetadata struct {
 	// target languages and appears here shortly after the call is submitted.
 	TotalCharacters int64 `protobuf:"varint,4,opt,name=total_characters,json=totalCharacters,proto3" json:"total_characters,omitempty"`
 	// Time when the operation was submitted.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 }
 
 func (x *BatchTranslateMetadata) Reset() {
@@ -2281,7 +2281,7 @@ func (x *BatchTranslateMetadata) GetTotalCharacters() int64 {
 	return 0
 }
 
-func (x *BatchTranslateMetadata) GetSubmitTime() *timestamp.Timestamp {
+func (x *BatchTranslateMetadata) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
@@ -2304,11 +2304,11 @@ type BatchTranslateResponse struct {
 	// Number of characters that have failed to process (Unicode codepoints).
 	FailedCharacters int64 `protobuf:"varint,3,opt,name=failed_characters,json=failedCharacters,proto3" json:"failed_characters,omitempty"`
 	// Time when the operation was submitted.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 	// The time when the operation is finished and
 	// [google.longrunning.Operation.done][google.longrunning.Operation.done] is
 	// set to true.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *BatchTranslateResponse) Reset() {
@@ -2364,14 +2364,14 @@ func (x *BatchTranslateResponse) GetFailedCharacters() int64 {
 	return 0
 }
 
-func (x *BatchTranslateResponse) GetSubmitTime() *timestamp.Timestamp {
+func (x *BatchTranslateResponse) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
 	return nil
 }
 
-func (x *BatchTranslateResponse) GetEndTime() *timestamp.Timestamp {
+func (x *BatchTranslateResponse) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2491,9 +2491,9 @@ type Glossary struct {
 	// Output only. The number of entries defined in the glossary.
 	EntryCount int32 `protobuf:"varint,6,opt,name=entry_count,json=entryCount,proto3" json:"entry_count,omitempty"`
 	// Output only. When CreateGlossary was called.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 	// Output only. When the glossary creation was finished.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *Glossary) Reset() {
@@ -2570,14 +2570,14 @@ func (x *Glossary) GetEntryCount() int32 {
 	return 0
 }
 
-func (x *Glossary) GetSubmitTime() *timestamp.Timestamp {
+func (x *Glossary) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
 	return nil
 }
 
-func (x *Glossary) GetEndTime() *timestamp.Timestamp {
+func (x *Glossary) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2926,7 +2926,7 @@ type CreateGlossaryMetadata struct {
 	// The current state of the glossary creation operation.
 	State CreateGlossaryMetadata_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.cloud.translation.v3.CreateGlossaryMetadata_State" json:"state,omitempty"`
 	// The time when the operation was submitted to the server.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 }
 
 func (x *CreateGlossaryMetadata) Reset() {
@@ -2975,7 +2975,7 @@ func (x *CreateGlossaryMetadata) GetState() CreateGlossaryMetadata_State {
 	return CreateGlossaryMetadata_STATE_UNSPECIFIED
 }
 
-func (x *CreateGlossaryMetadata) GetSubmitTime() *timestamp.Timestamp {
+func (x *CreateGlossaryMetadata) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
@@ -2995,7 +2995,7 @@ type DeleteGlossaryMetadata struct {
 	// The current state of the glossary deletion operation.
 	State DeleteGlossaryMetadata_State `protobuf:"varint,2,opt,name=state,proto3,enum=google.cloud.translation.v3.DeleteGlossaryMetadata_State" json:"state,omitempty"`
 	// The time when the operation was submitted to the server.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 }
 
 func (x *DeleteGlossaryMetadata) Reset() {
@@ -3044,7 +3044,7 @@ func (x *DeleteGlossaryMetadata) GetState() DeleteGlossaryMetadata_State {
 	return DeleteGlossaryMetadata_STATE_UNSPECIFIED
 }
 
-func (x *DeleteGlossaryMetadata) GetSubmitTime() *timestamp.Timestamp {
+func (x *DeleteGlossaryMetadata) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
@@ -3062,11 +3062,11 @@ type DeleteGlossaryResponse struct {
 	// The name of the deleted glossary.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// The time when the operation was submitted to the server.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 	// The time when the glossary deletion is finished and
 	// [google.longrunning.Operation.done][google.longrunning.Operation.done] is
 	// set to true.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *DeleteGlossaryResponse) Reset() {
@@ -3108,14 +3108,14 @@ func (x *DeleteGlossaryResponse) GetName() string {
 	return ""
 }
 
-func (x *DeleteGlossaryResponse) GetSubmitTime() *timestamp.Timestamp {
+func (x *DeleteGlossaryResponse) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
 	return nil
 }
 
-func (x *DeleteGlossaryResponse) GetEndTime() *timestamp.Timestamp {
+func (x *DeleteGlossaryResponse) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -3510,11 +3510,11 @@ type BatchTranslateDocumentResponse struct {
 	// clear page definition, such as XLSX.
 	TotalBillableCharacters int64 `protobuf:"varint,8,opt,name=total_billable_characters,json=totalBillableCharacters,proto3" json:"total_billable_characters,omitempty"`
 	// Time when the operation was submitted.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 	// The time when the operation is finished and
 	// [google.longrunning.Operation.done][google.longrunning.Operation.done] is
 	// set to true.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *BatchTranslateDocumentResponse) Reset() {
@@ -3605,14 +3605,14 @@ func (x *BatchTranslateDocumentResponse) GetTotalBillableCharacters() int64 {
 	return 0
 }
 
-func (x *BatchTranslateDocumentResponse) GetSubmitTime() *timestamp.Timestamp {
+func (x *BatchTranslateDocumentResponse) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
 	return nil
 }
 
-func (x *BatchTranslateDocumentResponse) GetEndTime() *timestamp.Timestamp {
+func (x *BatchTranslateDocumentResponse) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -3651,7 +3651,7 @@ type BatchTranslateDocumentMetadata struct {
 	// clear page definition (such as XLSX) so far.
 	TotalBillableCharacters int64 `protobuf:"varint,9,opt,name=total_billable_characters,json=totalBillableCharacters,proto3" json:"total_billable_characters,omitempty"`
 	// Time when the operation was submitted.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 }
 
 func (x *BatchTranslateDocumentMetadata) Reset() {
@@ -3749,7 +3749,7 @@ func (x *BatchTranslateDocumentMetadata) GetTotalBillableCharacters() int64 {
 	return 0
 }
 
-func (x *BatchTranslateDocumentMetadata) GetSubmitTime() *timestamp.Timestamp {
+func (x *BatchTranslateDocumentMetadata) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
@@ -4777,7 +4777,7 @@ var file_google_cloud_translate_v3_translation_service_proto_goTypes = []interfa
 	nil,                                       // 49: google.cloud.translation.v3.BatchTranslateDocumentRequest.ModelsEntry
 	nil,                                       // 50: google.cloud.translation.v3.BatchTranslateDocumentRequest.GlossariesEntry
 	nil,                                       // 51: google.cloud.translation.v3.BatchTranslateDocumentRequest.FormatConversionsEntry
-	(*timestamp.Timestamp)(nil),               // 52: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),             // 52: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),             // 53: google.longrunning.Operation
 }
 var file_google_cloud_translate_v3_translation_service_proto_depIdxs = []int32{
diff --git a/translate/apiv3/translation_client.go b/translate/apiv3/translation_client.go
index 37c04a1e528..c4cff11715b 100644
--- a/translate/apiv3/translation_client.go
+++ b/translate/apiv3/translation_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	translatepb "cloud.google.com/go/translate/apiv3/translatepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	translatepb "google.golang.org/genproto/googleapis/cloud/translate/v3"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/translate/apiv3/translation_client_example_test.go b/translate/apiv3/translation_client_example_test.go
index 762eb912b29..5ca793342ca 100644
--- a/translate/apiv3/translation_client_example_test.go
+++ b/translate/apiv3/translation_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	translate "cloud.google.com/go/translate/apiv3"
+	translatepb "cloud.google.com/go/translate/apiv3/translatepb"
 	"google.golang.org/api/iterator"
-	translatepb "google.golang.org/genproto/googleapis/cloud/translate/v3"
 )
 
 func ExampleNewTranslationClient() {
@@ -56,7 +56,7 @@ func ExampleTranslationClient_TranslateText() {
 
 	req := &translatepb.TranslateTextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#TranslateTextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#TranslateTextRequest.
 	}
 	resp, err := c.TranslateText(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleTranslationClient_DetectLanguage() {
 
 	req := &translatepb.DetectLanguageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#DetectLanguageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#DetectLanguageRequest.
 	}
 	resp, err := c.DetectLanguage(ctx, req)
 	if err != nil {
@@ -106,7 +106,7 @@ func ExampleTranslationClient_GetSupportedLanguages() {
 
 	req := &translatepb.GetSupportedLanguagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#GetSupportedLanguagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#GetSupportedLanguagesRequest.
 	}
 	resp, err := c.GetSupportedLanguages(ctx, req)
 	if err != nil {
@@ -131,7 +131,7 @@ func ExampleTranslationClient_TranslateDocument() {
 
 	req := &translatepb.TranslateDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#TranslateDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#TranslateDocumentRequest.
 	}
 	resp, err := c.TranslateDocument(ctx, req)
 	if err != nil {
@@ -156,7 +156,7 @@ func ExampleTranslationClient_BatchTranslateText() {
 
 	req := &translatepb.BatchTranslateTextRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#BatchTranslateTextRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#BatchTranslateTextRequest.
 	}
 	op, err := c.BatchTranslateText(ctx, req)
 	if err != nil {
@@ -186,7 +186,7 @@ func ExampleTranslationClient_BatchTranslateDocument() {
 
 	req := &translatepb.BatchTranslateDocumentRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#BatchTranslateDocumentRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#BatchTranslateDocumentRequest.
 	}
 	op, err := c.BatchTranslateDocument(ctx, req)
 	if err != nil {
@@ -216,7 +216,7 @@ func ExampleTranslationClient_CreateGlossary() {
 
 	req := &translatepb.CreateGlossaryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#CreateGlossaryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#CreateGlossaryRequest.
 	}
 	op, err := c.CreateGlossary(ctx, req)
 	if err != nil {
@@ -246,7 +246,7 @@ func ExampleTranslationClient_ListGlossaries() {
 
 	req := &translatepb.ListGlossariesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#ListGlossariesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#ListGlossariesRequest.
 	}
 	it := c.ListGlossaries(ctx, req)
 	for {
@@ -277,7 +277,7 @@ func ExampleTranslationClient_GetGlossary() {
 
 	req := &translatepb.GetGlossaryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#GetGlossaryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#GetGlossaryRequest.
 	}
 	resp, err := c.GetGlossary(ctx, req)
 	if err != nil {
@@ -302,7 +302,7 @@ func ExampleTranslationClient_DeleteGlossary() {
 
 	req := &translatepb.DeleteGlossaryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/translate/v3#DeleteGlossaryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/translate/apiv3/translatepb#DeleteGlossaryRequest.
 	}
 	op, err := c.DeleteGlossary(ctx, req)
 	if err != nil {
diff --git a/translate/go.mod b/translate/go.mod
index 777bd182c8e..44afe098181 100644
--- a/translate/go.mod
+++ b/translate/go.mod
@@ -3,12 +3,12 @@ module cloud.google.com/go/translate
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go v0.105.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
 	golang.org/x/text v0.3.8
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -16,12 +16,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/translate/go.sum b/translate/go.sum
index 9774f66a216..2037bbaf402 100644
--- a/translate/go.sum
+++ b/translate/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -64,11 +66,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -90,8 +92,8 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -99,8 +101,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/video/aliasshim/aliasshim.go b/video/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/video/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/video/go.mod b/video/go.mod
index f7b1c36df14..724cec73027 100644
--- a/video/go.mod
+++ b/video/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/video
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/video/go.sum b/video/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/video/go.sum
+++ b/video/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/video/livestream/apiv1/doc.go b/video/livestream/apiv1/doc.go
index 0aeae7fefa6..b2b0b8b9b5a 100644
--- a/video/livestream/apiv1/doc.go
+++ b/video/livestream/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &livestreampb.CreateChannelRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#CreateChannelRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#CreateChannelRequest.
 //	}
 //	op, err := c.CreateChannel(ctx, req)
 //	if err != nil {
diff --git a/video/livestream/apiv1/livestream_client.go b/video/livestream/apiv1/livestream_client.go
index a1147910362..fff97e5e633 100644
--- a/video/livestream/apiv1/livestream_client.go
+++ b/video/livestream/apiv1/livestream_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	livestreampb "cloud.google.com/go/video/livestream/apiv1/livestreampb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/video/livestream/apiv1/livestream_client_example_test.go b/video/livestream/apiv1/livestream_client_example_test.go
index fcfd1ed89e8..459970a2b81 100644
--- a/video/livestream/apiv1/livestream_client_example_test.go
+++ b/video/livestream/apiv1/livestream_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	livestream "cloud.google.com/go/video/livestream/apiv1"
+	livestreampb "cloud.google.com/go/video/livestream/apiv1/livestreampb"
 	"google.golang.org/api/iterator"
-	livestreampb "google.golang.org/genproto/googleapis/cloud/video/livestream/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_CreateChannel() {
 
 	req := &livestreampb.CreateChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#CreateChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#CreateChannelRequest.
 	}
 	op, err := c.CreateChannel(ctx, req)
 	if err != nil {
@@ -86,7 +86,7 @@ func ExampleClient_ListChannels() {
 
 	req := &livestreampb.ListChannelsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#ListChannelsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#ListChannelsRequest.
 	}
 	it := c.ListChannels(ctx, req)
 	for {
@@ -117,7 +117,7 @@ func ExampleClient_GetChannel() {
 
 	req := &livestreampb.GetChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#GetChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#GetChannelRequest.
 	}
 	resp, err := c.GetChannel(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleClient_DeleteChannel() {
 
 	req := &livestreampb.DeleteChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#DeleteChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#DeleteChannelRequest.
 	}
 	op, err := c.DeleteChannel(ctx, req)
 	if err != nil {
@@ -170,7 +170,7 @@ func ExampleClient_UpdateChannel() {
 
 	req := &livestreampb.UpdateChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#UpdateChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#UpdateChannelRequest.
 	}
 	op, err := c.UpdateChannel(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleClient_StartChannel() {
 
 	req := &livestreampb.StartChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#StartChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#StartChannelRequest.
 	}
 	op, err := c.StartChannel(ctx, req)
 	if err != nil {
@@ -230,7 +230,7 @@ func ExampleClient_StopChannel() {
 
 	req := &livestreampb.StopChannelRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#StopChannelRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#StopChannelRequest.
 	}
 	op, err := c.StopChannel(ctx, req)
 	if err != nil {
@@ -260,7 +260,7 @@ func ExampleClient_CreateInput() {
 
 	req := &livestreampb.CreateInputRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#CreateInputRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#CreateInputRequest.
 	}
 	op, err := c.CreateInput(ctx, req)
 	if err != nil {
@@ -290,7 +290,7 @@ func ExampleClient_ListInputs() {
 
 	req := &livestreampb.ListInputsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#ListInputsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#ListInputsRequest.
 	}
 	it := c.ListInputs(ctx, req)
 	for {
@@ -321,7 +321,7 @@ func ExampleClient_GetInput() {
 
 	req := &livestreampb.GetInputRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#GetInputRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#GetInputRequest.
 	}
 	resp, err := c.GetInput(ctx, req)
 	if err != nil {
@@ -346,7 +346,7 @@ func ExampleClient_DeleteInput() {
 
 	req := &livestreampb.DeleteInputRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#DeleteInputRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#DeleteInputRequest.
 	}
 	op, err := c.DeleteInput(ctx, req)
 	if err != nil {
@@ -374,7 +374,7 @@ func ExampleClient_UpdateInput() {
 
 	req := &livestreampb.UpdateInputRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#UpdateInputRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#UpdateInputRequest.
 	}
 	op, err := c.UpdateInput(ctx, req)
 	if err != nil {
@@ -404,7 +404,7 @@ func ExampleClient_CreateEvent() {
 
 	req := &livestreampb.CreateEventRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#CreateEventRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#CreateEventRequest.
 	}
 	resp, err := c.CreateEvent(ctx, req)
 	if err != nil {
@@ -429,7 +429,7 @@ func ExampleClient_ListEvents() {
 
 	req := &livestreampb.ListEventsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#ListEventsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#ListEventsRequest.
 	}
 	it := c.ListEvents(ctx, req)
 	for {
@@ -460,7 +460,7 @@ func ExampleClient_GetEvent() {
 
 	req := &livestreampb.GetEventRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#GetEventRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#GetEventRequest.
 	}
 	resp, err := c.GetEvent(ctx, req)
 	if err != nil {
@@ -485,7 +485,7 @@ func ExampleClient_DeleteEvent() {
 
 	req := &livestreampb.DeleteEventRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/livestream/v1#DeleteEventRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/livestream/apiv1/livestreampb#DeleteEventRequest.
 	}
 	err = c.DeleteEvent(ctx, req)
 	if err != nil {
diff --git a/video/livestream/apiv1/livestreampb/outputs.pb.go b/video/livestream/apiv1/livestreampb/outputs.pb.go
index 71fb709d805..64ebc082dcf 100644
--- a/video/livestream/apiv1/livestreampb/outputs.pb.go
+++ b/video/livestream/apiv1/livestreampb/outputs.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/livestream/v1/outputs.proto
 
 package livestreampb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -318,7 +318,7 @@ type Manifest struct {
 	// errors while accessing segments which are listed in the manifest that the
 	// player has, but were already deleted from the output Google Cloud Storage
 	// bucket. Default value is `60s`.
-	SegmentKeepDuration *duration.Duration `protobuf:"bytes,5,opt,name=segment_keep_duration,json=segmentKeepDuration,proto3" json:"segment_keep_duration,omitempty"`
+	SegmentKeepDuration *durationpb.Duration `protobuf:"bytes,5,opt,name=segment_keep_duration,json=segmentKeepDuration,proto3" json:"segment_keep_duration,omitempty"`
 }
 
 func (x *Manifest) Reset() {
@@ -381,7 +381,7 @@ func (x *Manifest) GetMaxSegmentCount() int32 {
 	return 0
 }
 
-func (x *Manifest) GetSegmentKeepDuration() *duration.Duration {
+func (x *Manifest) GetSegmentKeepDuration() *durationpb.Duration {
 	if x != nil {
 		return x.SegmentKeepDuration
 	}
@@ -419,7 +419,7 @@ type SpriteSheet struct {
 	RowCount int32 `protobuf:"varint,6,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
 	// Create sprites at regular intervals. Valid range is [1 second, 1 hour] and
 	// the default value is `10s`.
-	Interval *duration.Duration `protobuf:"bytes,7,opt,name=interval,proto3" json:"interval,omitempty"`
+	Interval *durationpb.Duration `protobuf:"bytes,7,opt,name=interval,proto3" json:"interval,omitempty"`
 	// The quality of the generated sprite sheet. Enter a value between 1
 	// and 100, where 1 is the lowest quality and 100 is the highest quality.
 	// The default is 100. A high quality value corresponds to a low image data
@@ -501,7 +501,7 @@ func (x *SpriteSheet) GetRowCount() int32 {
 	return 0
 }
 
-func (x *SpriteSheet) GetInterval() *duration.Duration {
+func (x *SpriteSheet) GetInterval() *durationpb.Duration {
 	if x != nil {
 		return x.Interval
 	}
@@ -833,7 +833,7 @@ type SegmentSettings struct {
 	//
 	// All [mux_streams][google.cloud.video.livestream.v1.Manifest.mux_streams] in the same manifest must have the
 	// same segment duration.
-	SegmentDuration *duration.Duration `protobuf:"bytes,1,opt,name=segment_duration,json=segmentDuration,proto3" json:"segment_duration,omitempty"`
+	SegmentDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=segment_duration,json=segmentDuration,proto3" json:"segment_duration,omitempty"`
 }
 
 func (x *SegmentSettings) Reset() {
@@ -868,7 +868,7 @@ func (*SegmentSettings) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_livestream_v1_outputs_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *SegmentSettings) GetSegmentDuration() *duration.Duration {
+func (x *SegmentSettings) GetSegmentDuration() *durationpb.Duration {
 	if x != nil {
 		return x.SegmentDuration
 	}
@@ -1191,7 +1191,7 @@ func (x *VideoStream_H264CodecSettings) GetGopFrameCount() int32 {
 	return 0
 }
 
-func (x *VideoStream_H264CodecSettings) GetGopDuration() *duration.Duration {
+func (x *VideoStream_H264CodecSettings) GetGopDuration() *durationpb.Duration {
 	if x, ok := x.GetGopMode().(*VideoStream_H264CodecSettings_GopDuration); ok {
 		return x.GopDuration
 	}
@@ -1275,7 +1275,7 @@ type VideoStream_H264CodecSettings_GopDuration struct {
 	// by `gopDuration`. Valid range is [2s, 20s].
 	//
 	// All video streams in the same channel must have the same GOP size.
-	GopDuration *duration.Duration `protobuf:"bytes,8,opt,name=gop_duration,json=gopDuration,proto3,oneof"`
+	GopDuration *durationpb.Duration `protobuf:"bytes,8,opt,name=gop_duration,json=gopDuration,proto3,oneof"`
 }
 
 func (*VideoStream_H264CodecSettings_GopFrameCount) isVideoStream_H264CodecSettings_GopMode() {}
@@ -1609,7 +1609,7 @@ var file_google_cloud_video_livestream_v1_outputs_proto_goTypes = []interface{}{
 	(*PreprocessingConfig_Pad)(nil),       // 11: google.cloud.video.livestream.v1.PreprocessingConfig.Pad
 	(*VideoStream_H264CodecSettings)(nil), // 12: google.cloud.video.livestream.v1.VideoStream.H264CodecSettings
 	(*AudioStream_AudioMapping)(nil),      // 13: google.cloud.video.livestream.v1.AudioStream.AudioMapping
-	(*duration.Duration)(nil),             // 14: google.protobuf.Duration
+	(*durationpb.Duration)(nil),           // 14: google.protobuf.Duration
 }
 var file_google_cloud_video_livestream_v1_outputs_proto_depIdxs = []int32{
 	6,  // 0: google.cloud.video.livestream.v1.ElementaryStream.video_stream:type_name -> google.cloud.video.livestream.v1.VideoStream
diff --git a/video/livestream/apiv1/livestreampb/resources.pb.go b/video/livestream/apiv1/livestreampb/resources.pb.go
index 53f0b3a6452..539849d75c4 100644
--- a/video/livestream/apiv1/livestreampb/resources.pb.go
+++ b/video/livestream/apiv1/livestreampb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/livestream/v1/resources.proto
 
 package livestreampb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -379,9 +379,9 @@ type Input struct {
 	// `projects/{project}/locations/{location}/inputs/{inputId}`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// User-defined key/value metadata.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Source type.
@@ -445,14 +445,14 @@ func (x *Input) GetName() string {
 	return ""
 }
 
-func (x *Input) GetCreateTime() *timestamp.Timestamp {
+func (x *Input) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Input) GetUpdateTime() *timestamp.Timestamp {
+func (x *Input) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -522,9 +522,9 @@ type Channel struct {
 	// `projects/{project}/locations/{location}/channels/{channelId}`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// User-defined key/value metadata.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// A list of input attachments that this channel uses.
@@ -594,14 +594,14 @@ func (x *Channel) GetName() string {
 	return ""
 }
 
-func (x *Channel) GetCreateTime() *timestamp.Timestamp {
+func (x *Channel) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Channel) GetUpdateTime() *timestamp.Timestamp {
+func (x *Channel) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -745,7 +745,7 @@ type InputStreamProperty struct {
 
 	// The time that the current input stream is accepted and the connection is
 	// established.
-	LastEstablishTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=last_establish_time,json=lastEstablishTime,proto3" json:"last_establish_time,omitempty"`
+	LastEstablishTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=last_establish_time,json=lastEstablishTime,proto3" json:"last_establish_time,omitempty"`
 	// Properties of the video streams.
 	VideoStreams []*VideoStreamProperty `protobuf:"bytes,2,rep,name=video_streams,json=videoStreams,proto3" json:"video_streams,omitempty"`
 	// Properties of the audio streams.
@@ -784,7 +784,7 @@ func (*InputStreamProperty) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_livestream_v1_resources_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *InputStreamProperty) GetLastEstablishTime() *timestamp.Timestamp {
+func (x *InputStreamProperty) GetLastEstablishTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastEstablishTime
 	}
@@ -1143,9 +1143,9 @@ type Event struct {
 	// `projects/{project}/locations/{location}/channels/{channelId}/events/{eventId}`.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The creation time.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// User-defined key/value metadata.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// Required. Operation to be executed by this event.
@@ -1161,7 +1161,7 @@ type Event struct {
 	// The time when the event should be executed. When [execute_now][google.cloud.video.livestream.v1.Event.execute_now] is set to
 	// `true`, this field should not be set in `CreateEvent` request and will be
 	// populated with the time that the server schedules the event.
-	ExecutionTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=execution_time,json=executionTime,proto3" json:"execution_time,omitempty"`
+	ExecutionTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=execution_time,json=executionTime,proto3" json:"execution_time,omitempty"`
 	// Output only. The state of the event.
 	State Event_State `protobuf:"varint,11,opt,name=state,proto3,enum=google.cloud.video.livestream.v1.Event_State" json:"state,omitempty"`
 	// Output only. An error object that describes the reason for the failure.
@@ -1208,14 +1208,14 @@ func (x *Event) GetName() string {
 	return ""
 }
 
-func (x *Event) GetCreateTime() *timestamp.Timestamp {
+func (x *Event) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Event) GetUpdateTime() *timestamp.Timestamp {
+func (x *Event) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1250,7 +1250,7 @@ func (x *Event) GetExecuteNow() bool {
 	return false
 }
 
-func (x *Event) GetExecutionTime() *timestamp.Timestamp {
+func (x *Event) GetExecutionTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExecutionTime
 	}
@@ -1441,7 +1441,7 @@ type Event_AdBreakTask struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Duration of an ad opportunity. Must be greater than 0.
-	Duration *duration.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
 }
 
 func (x *Event_AdBreakTask) Reset() {
@@ -1476,7 +1476,7 @@ func (*Event_AdBreakTask) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_livestream_v1_resources_proto_rawDescGZIP(), []int{9, 0}
 }
 
-func (x *Event_AdBreakTask) GetDuration() *duration.Duration {
+func (x *Event_AdBreakTask) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -1846,14 +1846,14 @@ var file_google_cloud_video_livestream_v1_resources_proto_goTypes = []interface{
 	(*InputAttachment_AutomaticFailover)(nil), // 19: google.cloud.video.livestream.v1.InputAttachment.AutomaticFailover
 	(*Event_AdBreakTask)(nil),                 // 20: google.cloud.video.livestream.v1.Event.AdBreakTask
 	nil,                                       // 21: google.cloud.video.livestream.v1.Event.LabelsEntry
-	(*timestamp.Timestamp)(nil),               // 22: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),             // 22: google.protobuf.Timestamp
 	(*PreprocessingConfig)(nil),               // 23: google.cloud.video.livestream.v1.PreprocessingConfig
 	(*ElementaryStream)(nil),                  // 24: google.cloud.video.livestream.v1.ElementaryStream
 	(*MuxStream)(nil),                         // 25: google.cloud.video.livestream.v1.MuxStream
 	(*Manifest)(nil),                          // 26: google.cloud.video.livestream.v1.Manifest
 	(*SpriteSheet)(nil),                       // 27: google.cloud.video.livestream.v1.SpriteSheet
 	(*status.Status)(nil),                     // 28: google.rpc.Status
-	(*duration.Duration)(nil),                 // 29: google.protobuf.Duration
+	(*durationpb.Duration)(nil),               // 29: google.protobuf.Duration
 }
 var file_google_cloud_video_livestream_v1_resources_proto_depIdxs = []int32{
 	22, // 0: google.cloud.video.livestream.v1.Input.create_time:type_name -> google.protobuf.Timestamp
diff --git a/video/livestream/apiv1/livestreampb/service.pb.go b/video/livestream/apiv1/livestreampb/service.pb.go
index 68aa6b1eb00..f87ea40960d 100644
--- a/video/livestream/apiv1/livestreampb/service.pb.go
+++ b/video/livestream/apiv1/livestreampb/service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/livestream/v1/service.proto
 
 package livestreampb
@@ -25,16 +25,16 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -445,7 +445,7 @@ type UpdateChannelRequest struct {
 	//
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The channel resource to be updated.
 	Channel *Channel `protobuf:"bytes,2,opt,name=channel,proto3" json:"channel,omitempty"`
 	// A request ID to identify requests. Specify a unique request ID
@@ -496,7 +496,7 @@ func (*UpdateChannelRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_livestream_v1_service_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *UpdateChannelRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateChannelRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1044,7 +1044,7 @@ type UpdateInputRequest struct {
 	//
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The input resource to be updated.
 	Input *Input `protobuf:"bytes,2,opt,name=input,proto3" json:"input,omitempty"`
 	// A request ID to identify requests. Specify a unique request ID
@@ -1095,7 +1095,7 @@ func (*UpdateInputRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_livestream_v1_service_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *UpdateInputRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateInputRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1533,9 +1533,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -1582,14 +1582,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_livestream_v1_service_proto_rawDescGZIP(), []int{20}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2117,12 +2117,12 @@ var file_google_cloud_video_livestream_v1_service_proto_goTypes = []interface{}{
 	(*ChannelOperationResponse)(nil), // 19: google.cloud.video.livestream.v1.ChannelOperationResponse
 	(*OperationMetadata)(nil),        // 20: google.cloud.video.livestream.v1.OperationMetadata
 	(*Channel)(nil),                  // 21: google.cloud.video.livestream.v1.Channel
-	(*field_mask.FieldMask)(nil),     // 22: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),    // 22: google.protobuf.FieldMask
 	(*Input)(nil),                    // 23: google.cloud.video.livestream.v1.Input
 	(*Event)(nil),                    // 24: google.cloud.video.livestream.v1.Event
-	(*timestamp.Timestamp)(nil),      // 25: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),    // 25: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),    // 26: google.longrunning.Operation
-	(*empty.Empty)(nil),              // 27: google.protobuf.Empty
+	(*emptypb.Empty)(nil),            // 27: google.protobuf.Empty
 }
 var file_google_cloud_video_livestream_v1_service_proto_depIdxs = []int32{
 	21, // 0: google.cloud.video.livestream.v1.CreateChannelRequest.channel:type_name -> google.cloud.video.livestream.v1.Channel
@@ -2502,7 +2502,7 @@ type LivestreamServiceClient interface {
 	// Returns the specified event.
 	GetEvent(ctx context.Context, in *GetEventRequest, opts ...grpc.CallOption) (*Event, error)
 	// Deletes the specified event.
-	DeleteEvent(ctx context.Context, in *DeleteEventRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteEvent(ctx context.Context, in *DeleteEventRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type livestreamServiceClient struct {
@@ -2648,8 +2648,8 @@ func (c *livestreamServiceClient) GetEvent(ctx context.Context, in *GetEventRequ
 	return out, nil
 }
 
-func (c *livestreamServiceClient) DeleteEvent(ctx context.Context, in *DeleteEventRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *livestreamServiceClient) DeleteEvent(ctx context.Context, in *DeleteEventRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.video.livestream.v1.LivestreamService/DeleteEvent", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2693,7 +2693,7 @@ type LivestreamServiceServer interface {
 	// Returns the specified event.
 	GetEvent(context.Context, *GetEventRequest) (*Event, error)
 	// Deletes the specified event.
-	DeleteEvent(context.Context, *DeleteEventRequest) (*empty.Empty, error)
+	DeleteEvent(context.Context, *DeleteEventRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedLivestreamServiceServer can be embedded to have forward compatible implementations.
@@ -2745,7 +2745,7 @@ func (*UnimplementedLivestreamServiceServer) ListEvents(context.Context, *ListEv
 func (*UnimplementedLivestreamServiceServer) GetEvent(context.Context, *GetEventRequest) (*Event, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetEvent not implemented")
 }
-func (*UnimplementedLivestreamServiceServer) DeleteEvent(context.Context, *DeleteEventRequest) (*empty.Empty, error) {
+func (*UnimplementedLivestreamServiceServer) DeleteEvent(context.Context, *DeleteEventRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteEvent not implemented")
 }
 
diff --git a/video/stitcher/apiv1/doc.go b/video/stitcher/apiv1/doc.go
index ec2b20976e7..d179323ff56 100644
--- a/video/stitcher/apiv1/doc.go
+++ b/video/stitcher/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &stitcherpb.CreateCdnKeyRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#CreateCdnKeyRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#CreateCdnKeyRequest.
 //	}
 //	resp, err := c.CreateCdnKey(ctx, req)
 //	if err != nil {
diff --git a/video/stitcher/apiv1/stitcherpb/ad_tag_details.pb.go b/video/stitcher/apiv1/stitcherpb/ad_tag_details.pb.go
index 814f1b477a3..749545698ae 100644
--- a/video/stitcher/apiv1/stitcherpb/ad_tag_details.pb.go
+++ b/video/stitcher/apiv1/stitcherpb/ad_tag_details.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/stitcher/v1/ad_tag_details.proto
 
 package stitcherpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	_struct "github.com/golang/protobuf/ptypes/struct"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -230,7 +230,7 @@ type RequestMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The HTTP headers of the ad request.
-	Headers *_struct.Struct `protobuf:"bytes,1,opt,name=headers,proto3" json:"headers,omitempty"`
+	Headers *structpb.Struct `protobuf:"bytes,1,opt,name=headers,proto3" json:"headers,omitempty"`
 }
 
 func (x *RequestMetadata) Reset() {
@@ -265,7 +265,7 @@ func (*RequestMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_stitcher_v1_ad_tag_details_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *RequestMetadata) GetHeaders() *_struct.Struct {
+func (x *RequestMetadata) GetHeaders() *structpb.Struct {
 	if x != nil {
 		return x.Headers
 	}
@@ -281,13 +281,13 @@ type ResponseMetadata struct {
 	// Error message received when making the ad request.
 	Error string `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
 	// Headers from the response.
-	Headers *_struct.Struct `protobuf:"bytes,2,opt,name=headers,proto3" json:"headers,omitempty"`
+	Headers *structpb.Struct `protobuf:"bytes,2,opt,name=headers,proto3" json:"headers,omitempty"`
 	// Status code for the response.
 	StatusCode string `protobuf:"bytes,3,opt,name=status_code,json=statusCode,proto3" json:"status_code,omitempty"`
 	// Size in bytes of the response.
 	SizeBytes int32 `protobuf:"varint,4,opt,name=size_bytes,json=sizeBytes,proto3" json:"size_bytes,omitempty"`
 	// Total time elapsed for the response.
-	Duration *duration.Duration `protobuf:"bytes,5,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,5,opt,name=duration,proto3" json:"duration,omitempty"`
 	// The body of the response.
 	Body string `protobuf:"bytes,6,opt,name=body,proto3" json:"body,omitempty"`
 }
@@ -331,7 +331,7 @@ func (x *ResponseMetadata) GetError() string {
 	return ""
 }
 
-func (x *ResponseMetadata) GetHeaders() *_struct.Struct {
+func (x *ResponseMetadata) GetHeaders() *structpb.Struct {
 	if x != nil {
 		return x.Headers
 	}
@@ -352,7 +352,7 @@ func (x *ResponseMetadata) GetSizeBytes() int32 {
 	return 0
 }
 
-func (x *ResponseMetadata) GetDuration() *duration.Duration {
+func (x *ResponseMetadata) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -472,13 +472,13 @@ func file_google_cloud_video_stitcher_v1_ad_tag_details_proto_rawDescGZIP() []by
 
 var file_google_cloud_video_stitcher_v1_ad_tag_details_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_google_cloud_video_stitcher_v1_ad_tag_details_proto_goTypes = []interface{}{
-	(*LiveAdTagDetail)(nil),   // 0: google.cloud.video.stitcher.v1.LiveAdTagDetail
-	(*VodAdTagDetail)(nil),    // 1: google.cloud.video.stitcher.v1.VodAdTagDetail
-	(*AdRequest)(nil),         // 2: google.cloud.video.stitcher.v1.AdRequest
-	(*RequestMetadata)(nil),   // 3: google.cloud.video.stitcher.v1.RequestMetadata
-	(*ResponseMetadata)(nil),  // 4: google.cloud.video.stitcher.v1.ResponseMetadata
-	(*_struct.Struct)(nil),    // 5: google.protobuf.Struct
-	(*duration.Duration)(nil), // 6: google.protobuf.Duration
+	(*LiveAdTagDetail)(nil),     // 0: google.cloud.video.stitcher.v1.LiveAdTagDetail
+	(*VodAdTagDetail)(nil),      // 1: google.cloud.video.stitcher.v1.VodAdTagDetail
+	(*AdRequest)(nil),           // 2: google.cloud.video.stitcher.v1.AdRequest
+	(*RequestMetadata)(nil),     // 3: google.cloud.video.stitcher.v1.RequestMetadata
+	(*ResponseMetadata)(nil),    // 4: google.cloud.video.stitcher.v1.ResponseMetadata
+	(*structpb.Struct)(nil),     // 5: google.protobuf.Struct
+	(*durationpb.Duration)(nil), // 6: google.protobuf.Duration
 }
 var file_google_cloud_video_stitcher_v1_ad_tag_details_proto_depIdxs = []int32{
 	2, // 0: google.cloud.video.stitcher.v1.LiveAdTagDetail.ad_requests:type_name -> google.cloud.video.stitcher.v1.AdRequest
diff --git a/video/stitcher/apiv1/stitcherpb/cdn_keys.pb.go b/video/stitcher/apiv1/stitcherpb/cdn_keys.pb.go
index fc7acf33bb7..8829e86ea26 100644
--- a/video/stitcher/apiv1/stitcherpb/cdn_keys.pb.go
+++ b/video/stitcher/apiv1/stitcherpb/cdn_keys.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/stitcher/v1/cdn_keys.proto
 
 package stitcherpb
diff --git a/video/stitcher/apiv1/stitcherpb/companions.pb.go b/video/stitcher/apiv1/stitcherpb/companions.pb.go
index f12c96c1bb5..7c793924afc 100644
--- a/video/stitcher/apiv1/stitcherpb/companions.pb.go
+++ b/video/stitcher/apiv1/stitcherpb/companions.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/stitcher/v1/companions.proto
 
 package stitcherpb
diff --git a/video/stitcher/apiv1/stitcherpb/events.pb.go b/video/stitcher/apiv1/stitcherpb/events.pb.go
index 6ef26177c16..b36edeaefcd 100644
--- a/video/stitcher/apiv1/stitcherpb/events.pb.go
+++ b/video/stitcher/apiv1/stitcherpb/events.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/stitcher/v1/events.proto
 
 package stitcherpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -190,7 +190,7 @@ type Event struct {
 	// The ID of the event.
 	Id string `protobuf:"bytes,3,opt,name=id,proto3" json:"id,omitempty"`
 	// The offset in seconds if the event type is `PROGRESS`.
-	Offset *duration.Duration `protobuf:"bytes,4,opt,name=offset,proto3" json:"offset,omitempty"`
+	Offset *durationpb.Duration `protobuf:"bytes,4,opt,name=offset,proto3" json:"offset,omitempty"`
 }
 
 func (x *Event) Reset() {
@@ -246,7 +246,7 @@ func (x *Event) GetId() string {
 	return ""
 }
 
-func (x *Event) GetOffset() *duration.Duration {
+func (x *Event) GetOffset() *durationpb.Duration {
 	if x != nil {
 		return x.Offset
 	}
@@ -262,7 +262,7 @@ type ProgressEvent struct {
 
 	// The time when the following tracking events occurs. The time is in
 	// seconds relative to the start of the VOD asset.
-	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	TimeOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 	// The list of progress tracking events for the ad break. These can be of
 	// the following IAB types: `BREAK_START`, `BREAK_END`, `IMPRESSION`,
 	// `CREATIVE_VIEW`, `START`, `FIRST_QUARTILE`, `MIDPOINT`, `THIRD_QUARTILE`,
@@ -302,7 +302,7 @@ func (*ProgressEvent) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_stitcher_v1_events_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ProgressEvent) GetTimeOffset() *duration.Duration {
+func (x *ProgressEvent) GetTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.TimeOffset
 	}
@@ -395,10 +395,10 @@ func file_google_cloud_video_stitcher_v1_events_proto_rawDescGZIP() []byte {
 var file_google_cloud_video_stitcher_v1_events_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_google_cloud_video_stitcher_v1_events_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_google_cloud_video_stitcher_v1_events_proto_goTypes = []interface{}{
-	(Event_EventType)(0),      // 0: google.cloud.video.stitcher.v1.Event.EventType
-	(*Event)(nil),             // 1: google.cloud.video.stitcher.v1.Event
-	(*ProgressEvent)(nil),     // 2: google.cloud.video.stitcher.v1.ProgressEvent
-	(*duration.Duration)(nil), // 3: google.protobuf.Duration
+	(Event_EventType)(0),        // 0: google.cloud.video.stitcher.v1.Event.EventType
+	(*Event)(nil),               // 1: google.cloud.video.stitcher.v1.Event
+	(*ProgressEvent)(nil),       // 2: google.cloud.video.stitcher.v1.ProgressEvent
+	(*durationpb.Duration)(nil), // 3: google.protobuf.Duration
 }
 var file_google_cloud_video_stitcher_v1_events_proto_depIdxs = []int32{
 	0, // 0: google.cloud.video.stitcher.v1.Event.type:type_name -> google.cloud.video.stitcher.v1.Event.EventType
diff --git a/video/stitcher/apiv1/stitcherpb/sessions.pb.go b/video/stitcher/apiv1/stitcherpb/sessions.pb.go
index 86ad88bf62e..3890af51f9b 100644
--- a/video/stitcher/apiv1/stitcherpb/sessions.pb.go
+++ b/video/stitcher/apiv1/stitcherpb/sessions.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/stitcher/v1/sessions.proto
 
 package stitcherpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 )
 
 const (
@@ -347,7 +347,7 @@ type VodSessionAd struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Duration in seconds of the ad.
-	Duration *duration.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
 	// Metadata of companion ads associated with the ad.
 	CompanionAds *CompanionAds `protobuf:"bytes,2,opt,name=companion_ads,json=companionAds,proto3" json:"companion_ads,omitempty"`
 	// The list of progress tracking events for the ad break. These can be of
@@ -390,7 +390,7 @@ func (*VodSessionAd) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_stitcher_v1_sessions_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *VodSessionAd) GetDuration() *duration.Duration {
+func (x *VodSessionAd) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -419,7 +419,7 @@ type VodSessionContent struct {
 
 	// The total duration in seconds of the content including the ads stitched
 	// in.
-	Duration *duration.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
+	Duration *durationpb.Duration `protobuf:"bytes,1,opt,name=duration,proto3" json:"duration,omitempty"`
 }
 
 func (x *VodSessionContent) Reset() {
@@ -454,7 +454,7 @@ func (*VodSessionContent) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_stitcher_v1_sessions_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *VodSessionContent) GetDuration() *duration.Duration {
+func (x *VodSessionContent) GetDuration() *durationpb.Duration {
 	if x != nil {
 		return x.Duration
 	}
@@ -472,9 +472,9 @@ type VodSessionAdBreak struct {
 	// Ordered list of ads stitched into the ad break.
 	Ads []*VodSessionAd `protobuf:"bytes,2,rep,name=ads,proto3" json:"ads,omitempty"`
 	// Ad break end time in seconds relative to the start of the VOD asset.
-	EndTimeOffset *duration.Duration `protobuf:"bytes,3,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	EndTimeOffset *durationpb.Duration `protobuf:"bytes,3,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
 	// Ad break start time in seconds relative to the start of the VOD asset.
-	StartTimeOffset *duration.Duration `protobuf:"bytes,4,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	StartTimeOffset *durationpb.Duration `protobuf:"bytes,4,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 }
 
 func (x *VodSessionAdBreak) Reset() {
@@ -523,14 +523,14 @@ func (x *VodSessionAdBreak) GetAds() []*VodSessionAd {
 	return nil
 }
 
-func (x *VodSessionAdBreak) GetEndTimeOffset() *duration.Duration {
+func (x *VodSessionAdBreak) GetEndTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.EndTimeOffset
 	}
 	return nil
 }
 
-func (x *VodSessionAdBreak) GetStartTimeOffset() *duration.Duration {
+func (x *VodSessionAdBreak) GetStartTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartTimeOffset
 	}
@@ -1111,7 +1111,7 @@ var file_google_cloud_video_stitcher_v1_sessions_proto_goTypes = []interface{}{
 	nil,                              // 11: google.cloud.video.stitcher.v1.VodSession.AdTagMacroMapEntry
 	nil,                              // 12: google.cloud.video.stitcher.v1.LiveSession.AdTagMapEntry
 	nil,                              // 13: google.cloud.video.stitcher.v1.LiveSession.AdTagMacrosEntry
-	(*duration.Duration)(nil),        // 14: google.protobuf.Duration
+	(*durationpb.Duration)(nil),      // 14: google.protobuf.Duration
 	(*CompanionAds)(nil),             // 15: google.cloud.video.stitcher.v1.CompanionAds
 	(*Event)(nil),                    // 16: google.cloud.video.stitcher.v1.Event
 	(*ProgressEvent)(nil),            // 17: google.cloud.video.stitcher.v1.ProgressEvent
diff --git a/video/stitcher/apiv1/stitcherpb/slates.pb.go b/video/stitcher/apiv1/stitcherpb/slates.pb.go
index da9a95b9315..153181361e2 100644
--- a/video/stitcher/apiv1/stitcherpb/slates.pb.go
+++ b/video/stitcher/apiv1/stitcherpb/slates.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/stitcher/v1/slates.proto
 
 package stitcherpb
diff --git a/video/stitcher/apiv1/stitcherpb/stitch_details.pb.go b/video/stitcher/apiv1/stitcherpb/stitch_details.pb.go
index ffe712affd6..10e8aa47ea8 100644
--- a/video/stitcher/apiv1/stitcherpb/stitch_details.pb.go
+++ b/video/stitcher/apiv1/stitcherpb/stitch_details.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/stitcher/v1/stitch_details.proto
 
 package stitcherpb
@@ -24,11 +24,11 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	duration "github.com/golang/protobuf/ptypes/duration"
-	_struct "github.com/golang/protobuf/ptypes/struct"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	structpb "google.golang.org/protobuf/types/known/structpb"
 )
 
 const (
@@ -108,11 +108,11 @@ type AdStitchDetail struct {
 	// Required. The ad ID of the processed ad.
 	AdId string `protobuf:"bytes,2,opt,name=ad_id,json=adId,proto3" json:"ad_id,omitempty"`
 	// Required. The time offset of the processed ad.
-	AdTimeOffset *duration.Duration `protobuf:"bytes,3,opt,name=ad_time_offset,json=adTimeOffset,proto3" json:"ad_time_offset,omitempty"`
+	AdTimeOffset *durationpb.Duration `protobuf:"bytes,3,opt,name=ad_time_offset,json=adTimeOffset,proto3" json:"ad_time_offset,omitempty"`
 	// Optional. Indicates the reason why the ad has been skipped.
 	SkipReason string `protobuf:"bytes,4,opt,name=skip_reason,json=skipReason,proto3" json:"skip_reason,omitempty"`
 	// Optional. The metadata of the chosen media file for the ad.
-	Media map[string]*_struct.Value `protobuf:"bytes,5,rep,name=media,proto3" json:"media,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Media map[string]*structpb.Value `protobuf:"bytes,5,rep,name=media,proto3" json:"media,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (x *AdStitchDetail) Reset() {
@@ -161,7 +161,7 @@ func (x *AdStitchDetail) GetAdId() string {
 	return ""
 }
 
-func (x *AdStitchDetail) GetAdTimeOffset() *duration.Duration {
+func (x *AdStitchDetail) GetAdTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.AdTimeOffset
 	}
@@ -175,7 +175,7 @@ func (x *AdStitchDetail) GetSkipReason() string {
 	return ""
 }
 
-func (x *AdStitchDetail) GetMedia() map[string]*_struct.Value {
+func (x *AdStitchDetail) GetMedia() map[string]*structpb.Value {
 	if x != nil {
 		return x.Media
 	}
@@ -264,11 +264,11 @@ func file_google_cloud_video_stitcher_v1_stitch_details_proto_rawDescGZIP() []by
 
 var file_google_cloud_video_stitcher_v1_stitch_details_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
 var file_google_cloud_video_stitcher_v1_stitch_details_proto_goTypes = []interface{}{
-	(*VodStitchDetail)(nil),   // 0: google.cloud.video.stitcher.v1.VodStitchDetail
-	(*AdStitchDetail)(nil),    // 1: google.cloud.video.stitcher.v1.AdStitchDetail
-	nil,                       // 2: google.cloud.video.stitcher.v1.AdStitchDetail.MediaEntry
-	(*duration.Duration)(nil), // 3: google.protobuf.Duration
-	(*_struct.Value)(nil),     // 4: google.protobuf.Value
+	(*VodStitchDetail)(nil),     // 0: google.cloud.video.stitcher.v1.VodStitchDetail
+	(*AdStitchDetail)(nil),      // 1: google.cloud.video.stitcher.v1.AdStitchDetail
+	nil,                         // 2: google.cloud.video.stitcher.v1.AdStitchDetail.MediaEntry
+	(*durationpb.Duration)(nil), // 3: google.protobuf.Duration
+	(*structpb.Value)(nil),      // 4: google.protobuf.Value
 }
 var file_google_cloud_video_stitcher_v1_stitch_details_proto_depIdxs = []int32{
 	1, // 0: google.cloud.video.stitcher.v1.VodStitchDetail.ad_stitch_details:type_name -> google.cloud.video.stitcher.v1.AdStitchDetail
diff --git a/video/stitcher/apiv1/stitcherpb/video_stitcher_service.pb.go b/video/stitcher/apiv1/stitcherpb/video_stitcher_service.pb.go
index 5c5f3698b7b..23d2a29d6d0 100644
--- a/video/stitcher/apiv1/stitcherpb/video_stitcher_service.pb.go
+++ b/video/stitcher/apiv1/stitcherpb/video_stitcher_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/stitcher/v1/video_stitcher_service.proto
 
 package stitcherpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -380,7 +380,7 @@ type UpdateCdnKeyRequest struct {
 	// Required. The update mask applies to the resource.
 	// For the `FieldMask` definition, see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateCdnKeyRequest) Reset() {
@@ -422,7 +422,7 @@ func (x *UpdateCdnKeyRequest) GetCdnKey() *CdnKey {
 	return nil
 }
 
-func (x *UpdateCdnKeyRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateCdnKeyRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1349,7 +1349,7 @@ type UpdateSlateRequest struct {
 	// Required. The resource with updated fields.
 	Slate *Slate `protobuf:"bytes,1,opt,name=slate,proto3" json:"slate,omitempty"`
 	// Required. The update mask which specifies fields which should be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateSlateRequest) Reset() {
@@ -1391,7 +1391,7 @@ func (x *UpdateSlateRequest) GetSlate() *Slate {
 	return nil
 }
 
-func (x *UpdateSlateRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSlateRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2123,14 +2123,14 @@ var file_google_cloud_video_stitcher_v1_video_stitcher_service_proto_goTypes = [
 	(*CreateLiveSessionRequest)(nil),     // 23: google.cloud.video.stitcher.v1.CreateLiveSessionRequest
 	(*GetLiveSessionRequest)(nil),        // 24: google.cloud.video.stitcher.v1.GetLiveSessionRequest
 	(*CdnKey)(nil),                       // 25: google.cloud.video.stitcher.v1.CdnKey
-	(*field_mask.FieldMask)(nil),         // 26: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),        // 26: google.protobuf.FieldMask
 	(*VodSession)(nil),                   // 27: google.cloud.video.stitcher.v1.VodSession
 	(*VodStitchDetail)(nil),              // 28: google.cloud.video.stitcher.v1.VodStitchDetail
 	(*VodAdTagDetail)(nil),               // 29: google.cloud.video.stitcher.v1.VodAdTagDetail
 	(*LiveAdTagDetail)(nil),              // 30: google.cloud.video.stitcher.v1.LiveAdTagDetail
 	(*Slate)(nil),                        // 31: google.cloud.video.stitcher.v1.Slate
 	(*LiveSession)(nil),                  // 32: google.cloud.video.stitcher.v1.LiveSession
-	(*empty.Empty)(nil),                  // 33: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                // 33: google.protobuf.Empty
 }
 var file_google_cloud_video_stitcher_v1_video_stitcher_service_proto_depIdxs = []int32{
 	25, // 0: google.cloud.video.stitcher.v1.CreateCdnKeyRequest.cdn_key:type_name -> google.cloud.video.stitcher.v1.CdnKey
@@ -2544,7 +2544,7 @@ type VideoStitcherServiceClient interface {
 	// Returns the specified CDN key.
 	GetCdnKey(ctx context.Context, in *GetCdnKeyRequest, opts ...grpc.CallOption) (*CdnKey, error)
 	// Deletes the specified CDN key.
-	DeleteCdnKey(ctx context.Context, in *DeleteCdnKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteCdnKey(ctx context.Context, in *DeleteCdnKeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Updates the specified CDN key. Only update fields specified
 	// in the call method body.
 	UpdateCdnKey(ctx context.Context, in *UpdateCdnKeyRequest, opts ...grpc.CallOption) (*CdnKey, error)
@@ -2576,7 +2576,7 @@ type VideoStitcherServiceClient interface {
 	// Updates the specified slate.
 	UpdateSlate(ctx context.Context, in *UpdateSlateRequest, opts ...grpc.CallOption) (*Slate, error)
 	// Deletes the specified slate.
-	DeleteSlate(ctx context.Context, in *DeleteSlateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteSlate(ctx context.Context, in *DeleteSlateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates a new live session.
 	CreateLiveSession(ctx context.Context, in *CreateLiveSessionRequest, opts ...grpc.CallOption) (*LiveSession, error)
 	// Returns the details for the specified live session.
@@ -2618,8 +2618,8 @@ func (c *videoStitcherServiceClient) GetCdnKey(ctx context.Context, in *GetCdnKe
 	return out, nil
 }
 
-func (c *videoStitcherServiceClient) DeleteCdnKey(ctx context.Context, in *DeleteCdnKeyRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *videoStitcherServiceClient) DeleteCdnKey(ctx context.Context, in *DeleteCdnKeyRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.video.stitcher.v1.VideoStitcherService/DeleteCdnKey", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2744,8 +2744,8 @@ func (c *videoStitcherServiceClient) UpdateSlate(ctx context.Context, in *Update
 	return out, nil
 }
 
-func (c *videoStitcherServiceClient) DeleteSlate(ctx context.Context, in *DeleteSlateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *videoStitcherServiceClient) DeleteSlate(ctx context.Context, in *DeleteSlateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.video.stitcher.v1.VideoStitcherService/DeleteSlate", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -2780,7 +2780,7 @@ type VideoStitcherServiceServer interface {
 	// Returns the specified CDN key.
 	GetCdnKey(context.Context, *GetCdnKeyRequest) (*CdnKey, error)
 	// Deletes the specified CDN key.
-	DeleteCdnKey(context.Context, *DeleteCdnKeyRequest) (*empty.Empty, error)
+	DeleteCdnKey(context.Context, *DeleteCdnKeyRequest) (*emptypb.Empty, error)
 	// Updates the specified CDN key. Only update fields specified
 	// in the call method body.
 	UpdateCdnKey(context.Context, *UpdateCdnKeyRequest) (*CdnKey, error)
@@ -2812,7 +2812,7 @@ type VideoStitcherServiceServer interface {
 	// Updates the specified slate.
 	UpdateSlate(context.Context, *UpdateSlateRequest) (*Slate, error)
 	// Deletes the specified slate.
-	DeleteSlate(context.Context, *DeleteSlateRequest) (*empty.Empty, error)
+	DeleteSlate(context.Context, *DeleteSlateRequest) (*emptypb.Empty, error)
 	// Creates a new live session.
 	CreateLiveSession(context.Context, *CreateLiveSessionRequest) (*LiveSession, error)
 	// Returns the details for the specified live session.
@@ -2832,7 +2832,7 @@ func (*UnimplementedVideoStitcherServiceServer) ListCdnKeys(context.Context, *Li
 func (*UnimplementedVideoStitcherServiceServer) GetCdnKey(context.Context, *GetCdnKeyRequest) (*CdnKey, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetCdnKey not implemented")
 }
-func (*UnimplementedVideoStitcherServiceServer) DeleteCdnKey(context.Context, *DeleteCdnKeyRequest) (*empty.Empty, error) {
+func (*UnimplementedVideoStitcherServiceServer) DeleteCdnKey(context.Context, *DeleteCdnKeyRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteCdnKey not implemented")
 }
 func (*UnimplementedVideoStitcherServiceServer) UpdateCdnKey(context.Context, *UpdateCdnKeyRequest) (*CdnKey, error) {
@@ -2874,7 +2874,7 @@ func (*UnimplementedVideoStitcherServiceServer) GetSlate(context.Context, *GetSl
 func (*UnimplementedVideoStitcherServiceServer) UpdateSlate(context.Context, *UpdateSlateRequest) (*Slate, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UpdateSlate not implemented")
 }
-func (*UnimplementedVideoStitcherServiceServer) DeleteSlate(context.Context, *DeleteSlateRequest) (*empty.Empty, error) {
+func (*UnimplementedVideoStitcherServiceServer) DeleteSlate(context.Context, *DeleteSlateRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteSlate not implemented")
 }
 func (*UnimplementedVideoStitcherServiceServer) CreateLiveSession(context.Context, *CreateLiveSessionRequest) (*LiveSession, error) {
diff --git a/video/stitcher/apiv1/video_stitcher_client.go b/video/stitcher/apiv1/video_stitcher_client.go
index 4b9a9dc6320..3fa69371a2b 100644
--- a/video/stitcher/apiv1/video_stitcher_client.go
+++ b/video/stitcher/apiv1/video_stitcher_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	stitcherpb "cloud.google.com/go/video/stitcher/apiv1/stitcherpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	stitcherpb "google.golang.org/genproto/googleapis/cloud/video/stitcher/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/video/stitcher/apiv1/video_stitcher_client_example_test.go b/video/stitcher/apiv1/video_stitcher_client_example_test.go
index 4a9e7c7b30a..fabda9d5580 100644
--- a/video/stitcher/apiv1/video_stitcher_client_example_test.go
+++ b/video/stitcher/apiv1/video_stitcher_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	stitcher "cloud.google.com/go/video/stitcher/apiv1"
+	stitcherpb "cloud.google.com/go/video/stitcher/apiv1/stitcherpb"
 	"google.golang.org/api/iterator"
-	stitcherpb "google.golang.org/genproto/googleapis/cloud/video/stitcher/v1"
 )
 
 func ExampleNewVideoStitcherClient() {
@@ -56,7 +56,7 @@ func ExampleVideoStitcherClient_CreateCdnKey() {
 
 	req := &stitcherpb.CreateCdnKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#CreateCdnKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#CreateCdnKeyRequest.
 	}
 	resp, err := c.CreateCdnKey(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleVideoStitcherClient_ListCdnKeys() {
 
 	req := &stitcherpb.ListCdnKeysRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#ListCdnKeysRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#ListCdnKeysRequest.
 	}
 	it := c.ListCdnKeys(ctx, req)
 	for {
@@ -112,7 +112,7 @@ func ExampleVideoStitcherClient_GetCdnKey() {
 
 	req := &stitcherpb.GetCdnKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#GetCdnKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#GetCdnKeyRequest.
 	}
 	resp, err := c.GetCdnKey(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleVideoStitcherClient_DeleteCdnKey() {
 
 	req := &stitcherpb.DeleteCdnKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#DeleteCdnKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#DeleteCdnKeyRequest.
 	}
 	err = c.DeleteCdnKey(ctx, req)
 	if err != nil {
@@ -160,7 +160,7 @@ func ExampleVideoStitcherClient_UpdateCdnKey() {
 
 	req := &stitcherpb.UpdateCdnKeyRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#UpdateCdnKeyRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#UpdateCdnKeyRequest.
 	}
 	resp, err := c.UpdateCdnKey(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleVideoStitcherClient_CreateVodSession() {
 
 	req := &stitcherpb.CreateVodSessionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#CreateVodSessionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#CreateVodSessionRequest.
 	}
 	resp, err := c.CreateVodSession(ctx, req)
 	if err != nil {
@@ -210,7 +210,7 @@ func ExampleVideoStitcherClient_GetVodSession() {
 
 	req := &stitcherpb.GetVodSessionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#GetVodSessionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#GetVodSessionRequest.
 	}
 	resp, err := c.GetVodSession(ctx, req)
 	if err != nil {
@@ -235,7 +235,7 @@ func ExampleVideoStitcherClient_ListVodStitchDetails() {
 
 	req := &stitcherpb.ListVodStitchDetailsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#ListVodStitchDetailsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#ListVodStitchDetailsRequest.
 	}
 	it := c.ListVodStitchDetails(ctx, req)
 	for {
@@ -266,7 +266,7 @@ func ExampleVideoStitcherClient_GetVodStitchDetail() {
 
 	req := &stitcherpb.GetVodStitchDetailRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#GetVodStitchDetailRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#GetVodStitchDetailRequest.
 	}
 	resp, err := c.GetVodStitchDetail(ctx, req)
 	if err != nil {
@@ -291,7 +291,7 @@ func ExampleVideoStitcherClient_ListVodAdTagDetails() {
 
 	req := &stitcherpb.ListVodAdTagDetailsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#ListVodAdTagDetailsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#ListVodAdTagDetailsRequest.
 	}
 	it := c.ListVodAdTagDetails(ctx, req)
 	for {
@@ -322,7 +322,7 @@ func ExampleVideoStitcherClient_GetVodAdTagDetail() {
 
 	req := &stitcherpb.GetVodAdTagDetailRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#GetVodAdTagDetailRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#GetVodAdTagDetailRequest.
 	}
 	resp, err := c.GetVodAdTagDetail(ctx, req)
 	if err != nil {
@@ -347,7 +347,7 @@ func ExampleVideoStitcherClient_ListLiveAdTagDetails() {
 
 	req := &stitcherpb.ListLiveAdTagDetailsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#ListLiveAdTagDetailsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#ListLiveAdTagDetailsRequest.
 	}
 	it := c.ListLiveAdTagDetails(ctx, req)
 	for {
@@ -378,7 +378,7 @@ func ExampleVideoStitcherClient_GetLiveAdTagDetail() {
 
 	req := &stitcherpb.GetLiveAdTagDetailRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#GetLiveAdTagDetailRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#GetLiveAdTagDetailRequest.
 	}
 	resp, err := c.GetLiveAdTagDetail(ctx, req)
 	if err != nil {
@@ -403,7 +403,7 @@ func ExampleVideoStitcherClient_CreateSlate() {
 
 	req := &stitcherpb.CreateSlateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#CreateSlateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#CreateSlateRequest.
 	}
 	resp, err := c.CreateSlate(ctx, req)
 	if err != nil {
@@ -428,7 +428,7 @@ func ExampleVideoStitcherClient_ListSlates() {
 
 	req := &stitcherpb.ListSlatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#ListSlatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#ListSlatesRequest.
 	}
 	it := c.ListSlates(ctx, req)
 	for {
@@ -459,7 +459,7 @@ func ExampleVideoStitcherClient_GetSlate() {
 
 	req := &stitcherpb.GetSlateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#GetSlateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#GetSlateRequest.
 	}
 	resp, err := c.GetSlate(ctx, req)
 	if err != nil {
@@ -484,7 +484,7 @@ func ExampleVideoStitcherClient_UpdateSlate() {
 
 	req := &stitcherpb.UpdateSlateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#UpdateSlateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#UpdateSlateRequest.
 	}
 	resp, err := c.UpdateSlate(ctx, req)
 	if err != nil {
@@ -509,7 +509,7 @@ func ExampleVideoStitcherClient_DeleteSlate() {
 
 	req := &stitcherpb.DeleteSlateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#DeleteSlateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#DeleteSlateRequest.
 	}
 	err = c.DeleteSlate(ctx, req)
 	if err != nil {
@@ -532,7 +532,7 @@ func ExampleVideoStitcherClient_CreateLiveSession() {
 
 	req := &stitcherpb.CreateLiveSessionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#CreateLiveSessionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#CreateLiveSessionRequest.
 	}
 	resp, err := c.CreateLiveSession(ctx, req)
 	if err != nil {
@@ -557,7 +557,7 @@ func ExampleVideoStitcherClient_GetLiveSession() {
 
 	req := &stitcherpb.GetLiveSessionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/stitcher/v1#GetLiveSessionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/stitcher/apiv1/stitcherpb#GetLiveSessionRequest.
 	}
 	resp, err := c.GetLiveSession(ctx, req)
 	if err != nil {
diff --git a/video/transcoder/apiv1/doc.go b/video/transcoder/apiv1/doc.go
index 60ade3583cc..bc174adfd61 100644
--- a/video/transcoder/apiv1/doc.go
+++ b/video/transcoder/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &transcoderpb.CreateJobRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#CreateJobRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#CreateJobRequest.
 //	}
 //	resp, err := c.CreateJob(ctx, req)
 //	if err != nil {
diff --git a/video/transcoder/apiv1/transcoder_client.go b/video/transcoder/apiv1/transcoder_client.go
index d45518b4dd5..b13b4137da1 100644
--- a/video/transcoder/apiv1/transcoder_client.go
+++ b/video/transcoder/apiv1/transcoder_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	transcoderpb "cloud.google.com/go/video/transcoder/apiv1/transcoderpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	transcoderpb "google.golang.org/genproto/googleapis/cloud/video/transcoder/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/video/transcoder/apiv1/transcoder_client_example_test.go b/video/transcoder/apiv1/transcoder_client_example_test.go
index 2bf1f68b608..9267e12811d 100644
--- a/video/transcoder/apiv1/transcoder_client_example_test.go
+++ b/video/transcoder/apiv1/transcoder_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	transcoder "cloud.google.com/go/video/transcoder/apiv1"
+	transcoderpb "cloud.google.com/go/video/transcoder/apiv1/transcoderpb"
 	"google.golang.org/api/iterator"
-	transcoderpb "google.golang.org/genproto/googleapis/cloud/video/transcoder/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_CreateJob() {
 
 	req := &transcoderpb.CreateJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#CreateJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#CreateJobRequest.
 	}
 	resp, err := c.CreateJob(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_ListJobs() {
 
 	req := &transcoderpb.ListJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#ListJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#ListJobsRequest.
 	}
 	it := c.ListJobs(ctx, req)
 	for {
@@ -112,7 +112,7 @@ func ExampleClient_GetJob() {
 
 	req := &transcoderpb.GetJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#GetJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#GetJobRequest.
 	}
 	resp, err := c.GetJob(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleClient_DeleteJob() {
 
 	req := &transcoderpb.DeleteJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#DeleteJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#DeleteJobRequest.
 	}
 	err = c.DeleteJob(ctx, req)
 	if err != nil {
@@ -160,7 +160,7 @@ func ExampleClient_CreateJobTemplate() {
 
 	req := &transcoderpb.CreateJobTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#CreateJobTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#CreateJobTemplateRequest.
 	}
 	resp, err := c.CreateJobTemplate(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleClient_ListJobTemplates() {
 
 	req := &transcoderpb.ListJobTemplatesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#ListJobTemplatesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#ListJobTemplatesRequest.
 	}
 	it := c.ListJobTemplates(ctx, req)
 	for {
@@ -216,7 +216,7 @@ func ExampleClient_GetJobTemplate() {
 
 	req := &transcoderpb.GetJobTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#GetJobTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#GetJobTemplateRequest.
 	}
 	resp, err := c.GetJobTemplate(ctx, req)
 	if err != nil {
@@ -241,7 +241,7 @@ func ExampleClient_DeleteJobTemplate() {
 
 	req := &transcoderpb.DeleteJobTemplateRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/video/transcoder/v1#DeleteJobTemplateRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/video/transcoder/apiv1/transcoderpb#DeleteJobTemplateRequest.
 	}
 	err = c.DeleteJobTemplate(ctx, req)
 	if err != nil {
diff --git a/video/transcoder/apiv1/transcoderpb/resources.pb.go b/video/transcoder/apiv1/transcoderpb/resources.pb.go
index 8ee3c3cc2f8..0b6ccca610d 100644
--- a/video/transcoder/apiv1/transcoderpb/resources.pb.go
+++ b/video/transcoder/apiv1/transcoderpb/resources.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/transcoder/v1/resources.proto
 
 package transcoderpb
@@ -24,12 +24,12 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -242,11 +242,11 @@ type Job struct {
 	// Output only. The current state of the job.
 	State Job_ProcessingState `protobuf:"varint,8,opt,name=state,proto3,enum=google.cloud.video.transcoder.v1.Job_ProcessingState" json:"state,omitempty"`
 	// Output only. The time the job was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,12,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,12,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the transcoding started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,13,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. The time the transcoding finished.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Job time to live value in days, which will be effective after job
 	// completion. Job should be deleted automatically after the given TTL. Enter
 	// a value between 1 and 90. The default is 30.
@@ -340,21 +340,21 @@ func (x *Job) GetState() Job_ProcessingState {
 	return Job_PROCESSING_STATE_UNSPECIFIED
 }
 
-func (x *Job) GetCreateTime() *timestamp.Timestamp {
+func (x *Job) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Job) GetStartTime() *timestamp.Timestamp {
+func (x *Job) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Job) GetEndTime() *timestamp.Timestamp {
+func (x *Job) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -749,10 +749,10 @@ type EditAtom struct {
 	// End time in seconds for the atom, relative to the input file timeline.
 	// When `end_time_offset` is not specified, the `inputs` are used until
 	// the end of the atom.
-	EndTimeOffset *duration.Duration `protobuf:"bytes,3,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	EndTimeOffset *durationpb.Duration `protobuf:"bytes,3,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
 	// Start time in seconds for the atom, relative to the input file timeline.
 	// The default is `0s`.
-	StartTimeOffset *duration.Duration `protobuf:"bytes,4,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	StartTimeOffset *durationpb.Duration `protobuf:"bytes,4,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 }
 
 func (x *EditAtom) Reset() {
@@ -801,14 +801,14 @@ func (x *EditAtom) GetInputs() []string {
 	return nil
 }
 
-func (x *EditAtom) GetEndTimeOffset() *duration.Duration {
+func (x *EditAtom) GetEndTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.EndTimeOffset
 	}
 	return nil
 }
 
-func (x *EditAtom) GetStartTimeOffset() *duration.Duration {
+func (x *EditAtom) GetStartTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartTimeOffset
 	}
@@ -823,7 +823,7 @@ type AdBreak struct {
 
 	// Start time in seconds for the ad break, relative to the output file
 	// timeline. The default is `0s`.
-	StartTimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	StartTimeOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 }
 
 func (x *AdBreak) Reset() {
@@ -858,7 +858,7 @@ func (*AdBreak) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_transcoder_v1_resources_proto_rawDescGZIP(), []int{6}
 }
 
-func (x *AdBreak) GetStartTimeOffset() *duration.Duration {
+func (x *AdBreak) GetStartTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartTimeOffset
 	}
@@ -1236,11 +1236,11 @@ type SpriteSheet struct {
 	RowCount int32 `protobuf:"varint,6,opt,name=row_count,json=rowCount,proto3" json:"row_count,omitempty"`
 	// Start time in seconds, relative to the output file timeline. Determines the
 	// first sprite to pick. The default is `0s`.
-	StartTimeOffset *duration.Duration `protobuf:"bytes,7,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	StartTimeOffset *durationpb.Duration `protobuf:"bytes,7,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 	// End time in seconds, relative to the output file timeline. When
 	// `end_time_offset` is not specified, the sprites are generated until the end
 	// of the output file.
-	EndTimeOffset *duration.Duration `protobuf:"bytes,8,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	EndTimeOffset *durationpb.Duration `protobuf:"bytes,8,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
 	// Specify either total number of sprites or interval to create sprites.
 	//
 	// Types that are assignable to ExtractionStrategy:
@@ -1329,14 +1329,14 @@ func (x *SpriteSheet) GetRowCount() int32 {
 	return 0
 }
 
-func (x *SpriteSheet) GetStartTimeOffset() *duration.Duration {
+func (x *SpriteSheet) GetStartTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartTimeOffset
 	}
 	return nil
 }
 
-func (x *SpriteSheet) GetEndTimeOffset() *duration.Duration {
+func (x *SpriteSheet) GetEndTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.EndTimeOffset
 	}
@@ -1357,7 +1357,7 @@ func (x *SpriteSheet) GetTotalCount() int32 {
 	return 0
 }
 
-func (x *SpriteSheet) GetInterval() *duration.Duration {
+func (x *SpriteSheet) GetInterval() *durationpb.Duration {
 	if x, ok := x.GetExtractionStrategy().(*SpriteSheet_Interval); ok {
 		return x.Interval
 	}
@@ -1385,7 +1385,7 @@ type SpriteSheet_TotalCount struct {
 type SpriteSheet_Interval struct {
 	// Starting from `0s`, create sprites at regular intervals. Specify the
 	// interval value in seconds.
-	Interval *duration.Duration `protobuf:"bytes,10,opt,name=interval,proto3,oneof"`
+	Interval *durationpb.Duration `protobuf:"bytes,10,opt,name=interval,proto3,oneof"`
 }
 
 func (*SpriteSheet_TotalCount) isSpriteSheet_ExtractionStrategy() {}
@@ -1836,7 +1836,7 @@ type SegmentSettings struct {
 	// `segmentDuration` must be greater than or equal to
 	// [`gopDuration`](#videostream), and `segmentDuration` must be divisible by
 	// [`gopDuration`](#videostream).
-	SegmentDuration *duration.Duration `protobuf:"bytes,1,opt,name=segment_duration,json=segmentDuration,proto3" json:"segment_duration,omitempty"`
+	SegmentDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=segment_duration,json=segmentDuration,proto3" json:"segment_duration,omitempty"`
 	// Required. Create an individual segment file. The default is `false`.
 	IndividualSegments bool `protobuf:"varint,3,opt,name=individual_segments,json=individualSegments,proto3" json:"individual_segments,omitempty"`
 }
@@ -1873,7 +1873,7 @@ func (*SegmentSettings) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_transcoder_v1_resources_proto_rawDescGZIP(), []int{17}
 }
 
-func (x *SegmentSettings) GetSegmentDuration() *duration.Duration {
+func (x *SegmentSettings) GetSegmentDuration() *durationpb.Duration {
 	if x != nil {
 		return x.SegmentDuration
 	}
@@ -2030,7 +2030,7 @@ type Overlay_AnimationStatic struct {
 	// output video.
 	Xy *Overlay_NormalizedCoordinate `protobuf:"bytes,1,opt,name=xy,proto3" json:"xy,omitempty"`
 	// The time to start displaying the overlay object, in seconds. Default: 0
-	StartTimeOffset *duration.Duration `protobuf:"bytes,2,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	StartTimeOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 }
 
 func (x *Overlay_AnimationStatic) Reset() {
@@ -2072,7 +2072,7 @@ func (x *Overlay_AnimationStatic) GetXy() *Overlay_NormalizedCoordinate {
 	return nil
 }
 
-func (x *Overlay_AnimationStatic) GetStartTimeOffset() *duration.Duration {
+func (x *Overlay_AnimationStatic) GetStartTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartTimeOffset
 	}
@@ -2094,10 +2094,10 @@ type Overlay_AnimationFade struct {
 	// output video.
 	Xy *Overlay_NormalizedCoordinate `protobuf:"bytes,2,opt,name=xy,proto3" json:"xy,omitempty"`
 	// The time to start the fade animation, in seconds. Default: 0
-	StartTimeOffset *duration.Duration `protobuf:"bytes,3,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	StartTimeOffset *durationpb.Duration `protobuf:"bytes,3,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 	// The time to end the fade animation, in seconds. Default:
 	// `start_time_offset` + 1s
-	EndTimeOffset *duration.Duration `protobuf:"bytes,4,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	EndTimeOffset *durationpb.Duration `protobuf:"bytes,4,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
 }
 
 func (x *Overlay_AnimationFade) Reset() {
@@ -2146,14 +2146,14 @@ func (x *Overlay_AnimationFade) GetXy() *Overlay_NormalizedCoordinate {
 	return nil
 }
 
-func (x *Overlay_AnimationFade) GetStartTimeOffset() *duration.Duration {
+func (x *Overlay_AnimationFade) GetStartTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartTimeOffset
 	}
 	return nil
 }
 
-func (x *Overlay_AnimationFade) GetEndTimeOffset() *duration.Duration {
+func (x *Overlay_AnimationFade) GetEndTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.EndTimeOffset
 	}
@@ -2169,7 +2169,7 @@ type Overlay_AnimationEnd struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time to end overlay object, in seconds. Default: 0
-	StartTimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	StartTimeOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 }
 
 func (x *Overlay_AnimationEnd) Reset() {
@@ -2204,7 +2204,7 @@ func (*Overlay_AnimationEnd) Descriptor() ([]byte, []int) {
 	return file_google_cloud_video_transcoder_v1_resources_proto_rawDescGZIP(), []int{12, 4}
 }
 
-func (x *Overlay_AnimationEnd) GetStartTimeOffset() *duration.Duration {
+func (x *Overlay_AnimationEnd) GetStartTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartTimeOffset
 	}
@@ -2967,7 +2967,7 @@ func (x *VideoStream_H264CodecSettings) GetGopFrameCount() int32 {
 	return 0
 }
 
-func (x *VideoStream_H264CodecSettings) GetGopDuration() *duration.Duration {
+func (x *VideoStream_H264CodecSettings) GetGopDuration() *durationpb.Duration {
 	if x, ok := x.GetGopMode().(*VideoStream_H264CodecSettings_GopDuration); ok {
 		return x.GopDuration
 	}
@@ -3060,7 +3060,7 @@ type VideoStream_H264CodecSettings_GopDuration struct {
 	// [`segmentDuration`](#SegmentSettings), and
 	// [`segmentDuration`](#SegmentSettings) must be divisible by
 	// `gopDuration`.
-	GopDuration *duration.Duration `protobuf:"bytes,10,opt,name=gop_duration,json=gopDuration,proto3,oneof"`
+	GopDuration *durationpb.Duration `protobuf:"bytes,10,opt,name=gop_duration,json=gopDuration,proto3,oneof"`
 }
 
 func (*VideoStream_H264CodecSettings_GopFrameCount) isVideoStream_H264CodecSettings_GopMode() {}
@@ -3294,7 +3294,7 @@ func (x *VideoStream_H265CodecSettings) GetGopFrameCount() int32 {
 	return 0
 }
 
-func (x *VideoStream_H265CodecSettings) GetGopDuration() *duration.Duration {
+func (x *VideoStream_H265CodecSettings) GetGopDuration() *durationpb.Duration {
 	if x, ok := x.GetGopMode().(*VideoStream_H265CodecSettings_GopDuration); ok {
 		return x.GopDuration
 	}
@@ -3380,7 +3380,7 @@ type VideoStream_H265CodecSettings_GopDuration struct {
 	// [`segmentDuration`](#SegmentSettings), and
 	// [`segmentDuration`](#SegmentSettings) must be divisible by
 	// `gopDuration`.
-	GopDuration *duration.Duration `protobuf:"bytes,10,opt,name=gop_duration,json=gopDuration,proto3,oneof"`
+	GopDuration *durationpb.Duration `protobuf:"bytes,10,opt,name=gop_duration,json=gopDuration,proto3,oneof"`
 }
 
 func (*VideoStream_H265CodecSettings_GopFrameCount) isVideoStream_H265CodecSettings_GopMode() {}
@@ -3555,7 +3555,7 @@ func (x *VideoStream_Vp9CodecSettings) GetGopFrameCount() int32 {
 	return 0
 }
 
-func (x *VideoStream_Vp9CodecSettings) GetGopDuration() *duration.Duration {
+func (x *VideoStream_Vp9CodecSettings) GetGopDuration() *durationpb.Duration {
 	if x, ok := x.GetGopMode().(*VideoStream_Vp9CodecSettings_GopDuration); ok {
 		return x.GopDuration
 	}
@@ -3585,7 +3585,7 @@ type VideoStream_Vp9CodecSettings_GopDuration struct {
 	// [`segmentDuration`](#SegmentSettings), and
 	// [`segmentDuration`](#SegmentSettings) must be divisible by
 	// `gopDuration`.
-	GopDuration *duration.Duration `protobuf:"bytes,9,opt,name=gop_duration,json=gopDuration,proto3,oneof"`
+	GopDuration *durationpb.Duration `protobuf:"bytes,9,opt,name=gop_duration,json=gopDuration,proto3,oneof"`
 }
 
 func (*VideoStream_Vp9CodecSettings_GopFrameCount) isVideoStream_Vp9CodecSettings_GopMode() {}
@@ -4430,9 +4430,9 @@ var file_google_cloud_video_transcoder_v1_resources_proto_goTypes = []interface{
 	(*VideoStream_Vp9CodecSettings)(nil),  // 37: google.cloud.video.transcoder.v1.VideoStream.Vp9CodecSettings
 	(*AudioStream_AudioMapping)(nil),      // 38: google.cloud.video.transcoder.v1.AudioStream.AudioMapping
 	(*TextStream_TextMapping)(nil),        // 39: google.cloud.video.transcoder.v1.TextStream.TextMapping
-	(*timestamp.Timestamp)(nil),           // 40: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),         // 40: google.protobuf.Timestamp
 	(*status.Status)(nil),                 // 41: google.rpc.Status
-	(*duration.Duration)(nil),             // 42: google.protobuf.Duration
+	(*durationpb.Duration)(nil),           // 42: google.protobuf.Duration
 }
 var file_google_cloud_video_transcoder_v1_resources_proto_depIdxs = []int32{
 	5,  // 0: google.cloud.video.transcoder.v1.Job.config:type_name -> google.cloud.video.transcoder.v1.JobConfig
diff --git a/video/transcoder/apiv1/transcoderpb/services.pb.go b/video/transcoder/apiv1/transcoderpb/services.pb.go
index 2b1a5f72552..be7f7ca704b 100644
--- a/video/transcoder/apiv1/transcoderpb/services.pb.go
+++ b/video/transcoder/apiv1/transcoderpb/services.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/video/transcoder/v1/services.proto
 
 package transcoderpb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	empty "github.com/golang/protobuf/ptypes/empty"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
 )
 
 const (
@@ -963,7 +963,7 @@ var file_google_cloud_video_transcoder_v1_services_proto_goTypes = []interface{}
 	(*ListJobTemplatesResponse)(nil), // 9: google.cloud.video.transcoder.v1.ListJobTemplatesResponse
 	(*Job)(nil),                      // 10: google.cloud.video.transcoder.v1.Job
 	(*JobTemplate)(nil),              // 11: google.cloud.video.transcoder.v1.JobTemplate
-	(*empty.Empty)(nil),              // 12: google.protobuf.Empty
+	(*emptypb.Empty)(nil),            // 12: google.protobuf.Empty
 }
 var file_google_cloud_video_transcoder_v1_services_proto_depIdxs = []int32{
 	10, // 0: google.cloud.video.transcoder.v1.CreateJobRequest.job:type_name -> google.cloud.video.transcoder.v1.Job
@@ -1160,7 +1160,7 @@ type TranscoderServiceClient interface {
 	// Returns the job data.
 	GetJob(ctx context.Context, in *GetJobRequest, opts ...grpc.CallOption) (*Job, error)
 	// Deletes a job.
-	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates a job template in the specified region.
 	CreateJobTemplate(ctx context.Context, in *CreateJobTemplateRequest, opts ...grpc.CallOption) (*JobTemplate, error)
 	// Lists job templates in the specified region.
@@ -1168,7 +1168,7 @@ type TranscoderServiceClient interface {
 	// Returns the job template data.
 	GetJobTemplate(ctx context.Context, in *GetJobTemplateRequest, opts ...grpc.CallOption) (*JobTemplate, error)
 	// Deletes a job template.
-	DeleteJobTemplate(ctx context.Context, in *DeleteJobTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteJobTemplate(ctx context.Context, in *DeleteJobTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
 type transcoderServiceClient struct {
@@ -1206,8 +1206,8 @@ func (c *transcoderServiceClient) GetJob(ctx context.Context, in *GetJobRequest,
 	return out, nil
 }
 
-func (c *transcoderServiceClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *transcoderServiceClient) DeleteJob(ctx context.Context, in *DeleteJobRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.video.transcoder.v1.TranscoderService/DeleteJob", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1242,8 +1242,8 @@ func (c *transcoderServiceClient) GetJobTemplate(ctx context.Context, in *GetJob
 	return out, nil
 }
 
-func (c *transcoderServiceClient) DeleteJobTemplate(ctx context.Context, in *DeleteJobTemplateRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *transcoderServiceClient) DeleteJobTemplate(ctx context.Context, in *DeleteJobTemplateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.video.transcoder.v1.TranscoderService/DeleteJobTemplate", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1260,7 +1260,7 @@ type TranscoderServiceServer interface {
 	// Returns the job data.
 	GetJob(context.Context, *GetJobRequest) (*Job, error)
 	// Deletes a job.
-	DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error)
+	DeleteJob(context.Context, *DeleteJobRequest) (*emptypb.Empty, error)
 	// Creates a job template in the specified region.
 	CreateJobTemplate(context.Context, *CreateJobTemplateRequest) (*JobTemplate, error)
 	// Lists job templates in the specified region.
@@ -1268,7 +1268,7 @@ type TranscoderServiceServer interface {
 	// Returns the job template data.
 	GetJobTemplate(context.Context, *GetJobTemplateRequest) (*JobTemplate, error)
 	// Deletes a job template.
-	DeleteJobTemplate(context.Context, *DeleteJobTemplateRequest) (*empty.Empty, error)
+	DeleteJobTemplate(context.Context, *DeleteJobTemplateRequest) (*emptypb.Empty, error)
 }
 
 // UnimplementedTranscoderServiceServer can be embedded to have forward compatible implementations.
@@ -1284,7 +1284,7 @@ func (*UnimplementedTranscoderServiceServer) ListJobs(context.Context, *ListJobs
 func (*UnimplementedTranscoderServiceServer) GetJob(context.Context, *GetJobRequest) (*Job, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetJob not implemented")
 }
-func (*UnimplementedTranscoderServiceServer) DeleteJob(context.Context, *DeleteJobRequest) (*empty.Empty, error) {
+func (*UnimplementedTranscoderServiceServer) DeleteJob(context.Context, *DeleteJobRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteJob not implemented")
 }
 func (*UnimplementedTranscoderServiceServer) CreateJobTemplate(context.Context, *CreateJobTemplateRequest) (*JobTemplate, error) {
@@ -1296,7 +1296,7 @@ func (*UnimplementedTranscoderServiceServer) ListJobTemplates(context.Context, *
 func (*UnimplementedTranscoderServiceServer) GetJobTemplate(context.Context, *GetJobTemplateRequest) (*JobTemplate, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetJobTemplate not implemented")
 }
-func (*UnimplementedTranscoderServiceServer) DeleteJobTemplate(context.Context, *DeleteJobTemplateRequest) (*empty.Empty, error) {
+func (*UnimplementedTranscoderServiceServer) DeleteJobTemplate(context.Context, *DeleteJobTemplateRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteJobTemplate not implemented")
 }
 
diff --git a/videointelligence/apiv1/doc.go b/videointelligence/apiv1/doc.go
index 030c788d5b4..fd5edb227c7 100644
--- a/videointelligence/apiv1/doc.go
+++ b/videointelligence/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &videointelligencepb.AnnotateVideoRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/videointelligence/v1#AnnotateVideoRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/videointelligence/apiv1/videointelligencepb#AnnotateVideoRequest.
 //	}
 //	op, err := c.AnnotateVideo(ctx, req)
 //	if err != nil {
diff --git a/videointelligence/apiv1/video_intelligence_client.go b/videointelligence/apiv1/video_intelligence_client.go
index 0043fc846a5..9b9f24ce0f5 100644
--- a/videointelligence/apiv1/video_intelligence_client.go
+++ b/videointelligence/apiv1/video_intelligence_client.go
@@ -23,11 +23,11 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	videointelligencepb "cloud.google.com/go/videointelligence/apiv1/videointelligencepb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/videointelligence/apiv1/video_intelligence_client_example_test.go b/videointelligence/apiv1/video_intelligence_client_example_test.go
index 3d657a94e41..ee9f61e19d7 100644
--- a/videointelligence/apiv1/video_intelligence_client_example_test.go
+++ b/videointelligence/apiv1/video_intelligence_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	videointelligence "cloud.google.com/go/videointelligence/apiv1"
-	videointelligencepb "google.golang.org/genproto/googleapis/cloud/videointelligence/v1"
+	videointelligencepb "cloud.google.com/go/videointelligence/apiv1/videointelligencepb"
 )
 
 func ExampleNewClient() {
@@ -55,7 +55,7 @@ func ExampleClient_AnnotateVideo() {
 
 	req := &videointelligencepb.AnnotateVideoRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/videointelligence/v1#AnnotateVideoRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/videointelligence/apiv1/videointelligencepb#AnnotateVideoRequest.
 	}
 	op, err := c.AnnotateVideo(ctx, req)
 	if err != nil {
diff --git a/videointelligence/apiv1/videointelligencepb/video_intelligence.pb.go b/videointelligence/apiv1/videointelligencepb/video_intelligence.pb.go
index 5da116e3adc..9dfd221af8f 100644
--- a/videointelligence/apiv1/videointelligencepb/video_intelligence.pb.go
+++ b/videointelligence/apiv1/videointelligencepb/video_intelligence.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/videointelligence/v1/video_intelligence.proto
 
 package videointelligencepb
@@ -25,8 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -35,6 +33,8 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -953,10 +953,10 @@ type VideoSegment struct {
 
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the start of the segment (inclusive).
-	StartTimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
+	StartTimeOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=start_time_offset,json=startTimeOffset,proto3" json:"start_time_offset,omitempty"`
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the end of the segment (inclusive).
-	EndTimeOffset *duration.Duration `protobuf:"bytes,2,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
+	EndTimeOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=end_time_offset,json=endTimeOffset,proto3" json:"end_time_offset,omitempty"`
 }
 
 func (x *VideoSegment) Reset() {
@@ -991,14 +991,14 @@ func (*VideoSegment) Descriptor() ([]byte, []int) {
 	return file_google_cloud_videointelligence_v1_video_intelligence_proto_rawDescGZIP(), []int{9}
 }
 
-func (x *VideoSegment) GetStartTimeOffset() *duration.Duration {
+func (x *VideoSegment) GetStartTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.StartTimeOffset
 	}
 	return nil
 }
 
-func (x *VideoSegment) GetEndTimeOffset() *duration.Duration {
+func (x *VideoSegment) GetEndTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.EndTimeOffset
 	}
@@ -1071,7 +1071,7 @@ type LabelFrame struct {
 
 	// Time-offset, relative to the beginning of the video, corresponding to the
 	// video frame for this location.
-	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	TimeOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 	// Confidence that the label is accurate. Range: [0, 1].
 	Confidence float32 `protobuf:"fixed32,2,opt,name=confidence,proto3" json:"confidence,omitempty"`
 }
@@ -1108,7 +1108,7 @@ func (*LabelFrame) Descriptor() ([]byte, []int) {
 	return file_google_cloud_videointelligence_v1_video_intelligence_proto_rawDescGZIP(), []int{11}
 }
 
-func (x *LabelFrame) GetTimeOffset() *duration.Duration {
+func (x *LabelFrame) GetTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.TimeOffset
 	}
@@ -1287,7 +1287,7 @@ type ExplicitContentFrame struct {
 
 	// Time-offset, relative to the beginning of the video, corresponding to the
 	// video frame for this location.
-	TimeOffset *duration.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	TimeOffset *durationpb.Duration `protobuf:"bytes,1,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 	// Likelihood of the pornography content..
 	PornographyLikelihood Likelihood `protobuf:"varint,2,opt,name=pornography_likelihood,json=pornographyLikelihood,proto3,enum=google.cloud.videointelligence.v1.Likelihood" json:"pornography_likelihood,omitempty"`
 }
@@ -1324,7 +1324,7 @@ func (*ExplicitContentFrame) Descriptor() ([]byte, []int) {
 	return file_google_cloud_videointelligence_v1_video_intelligence_proto_rawDescGZIP(), []int{14}
 }
 
-func (x *ExplicitContentFrame) GetTimeOffset() *duration.Duration {
+func (x *ExplicitContentFrame) GetTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.TimeOffset
 	}
@@ -1664,7 +1664,7 @@ type FaceFrame struct {
 	NormalizedBoundingBoxes []*NormalizedBoundingBox `protobuf:"bytes,1,rep,name=normalized_bounding_boxes,json=normalizedBoundingBoxes,proto3" json:"normalized_bounding_boxes,omitempty"`
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the video frame for this location.
-	TimeOffset *duration.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	TimeOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 }
 
 func (x *FaceFrame) Reset() {
@@ -1706,7 +1706,7 @@ func (x *FaceFrame) GetNormalizedBoundingBoxes() []*NormalizedBoundingBox {
 	return nil
 }
 
-func (x *FaceFrame) GetTimeOffset() *duration.Duration {
+func (x *FaceFrame) GetTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.TimeOffset
 	}
@@ -1794,7 +1794,7 @@ type TimestampedObject struct {
 	NormalizedBoundingBox *NormalizedBoundingBox `protobuf:"bytes,1,opt,name=normalized_bounding_box,json=normalizedBoundingBox,proto3" json:"normalized_bounding_box,omitempty"`
 	// Time-offset, relative to the beginning of the video,
 	// corresponding to the video frame for this object.
-	TimeOffset *duration.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	TimeOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 	// Optional. The attributes of the object in the bounding box.
 	Attributes []*DetectedAttribute `protobuf:"bytes,3,rep,name=attributes,proto3" json:"attributes,omitempty"`
 	// Optional. The detected landmarks.
@@ -1840,7 +1840,7 @@ func (x *TimestampedObject) GetNormalizedBoundingBox() *NormalizedBoundingBox {
 	return nil
 }
 
-func (x *TimestampedObject) GetTimeOffset() *duration.Duration {
+func (x *TimestampedObject) GetTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.TimeOffset
 	}
@@ -2351,9 +2351,9 @@ type VideoAnnotationProgress struct {
 	// 100 when fully processed.
 	ProgressPercent int32 `protobuf:"varint,2,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 	// Time when the request was received.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time of the most recent update.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Specifies which feature is being tracked if the request contains more than
 	// one feature.
 	Feature Feature `protobuf:"varint,5,opt,name=feature,proto3,enum=google.cloud.videointelligence.v1.Feature" json:"feature,omitempty"`
@@ -2408,14 +2408,14 @@ func (x *VideoAnnotationProgress) GetProgressPercent() int32 {
 	return 0
 }
 
-func (x *VideoAnnotationProgress) GetStartTime() *timestamp.Timestamp {
+func (x *VideoAnnotationProgress) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *VideoAnnotationProgress) GetUpdateTime() *timestamp.Timestamp {
+func (x *VideoAnnotationProgress) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2839,12 +2839,12 @@ type WordInfo struct {
 	// corresponding to the start of the spoken word. This field is only set if
 	// `enable_word_time_offsets=true` and only in the top hypothesis. This is an
 	// experimental feature and the accuracy of the time offset can vary.
-	StartTime *duration.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *durationpb.Duration `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Time offset relative to the beginning of the audio, and
 	// corresponding to the end of the spoken word. This field is only set if
 	// `enable_word_time_offsets=true` and only in the top hypothesis. This is an
 	// experimental feature and the accuracy of the time offset can vary.
-	EndTime *duration.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *durationpb.Duration `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// The word corresponding to this set of information.
 	Word string `protobuf:"bytes,3,opt,name=word,proto3" json:"word,omitempty"`
 	// Output only. The confidence estimate between 0.0 and 1.0. A higher number
@@ -2893,14 +2893,14 @@ func (*WordInfo) Descriptor() ([]byte, []int) {
 	return file_google_cloud_videointelligence_v1_video_intelligence_proto_rawDescGZIP(), []int{34}
 }
 
-func (x *WordInfo) GetStartTime() *duration.Duration {
+func (x *WordInfo) GetStartTime() *durationpb.Duration {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *WordInfo) GetEndTime() *duration.Duration {
+func (x *WordInfo) GetEndTime() *durationpb.Duration {
 	if x != nil {
 		return x.EndTime
 	}
@@ -3134,7 +3134,7 @@ type TextFrame struct {
 	// Bounding polygon of the detected text for this frame.
 	RotatedBoundingBox *NormalizedBoundingPoly `protobuf:"bytes,1,opt,name=rotated_bounding_box,json=rotatedBoundingBox,proto3" json:"rotated_bounding_box,omitempty"`
 	// Timestamp of this frame.
-	TimeOffset *duration.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	TimeOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 }
 
 func (x *TextFrame) Reset() {
@@ -3176,7 +3176,7 @@ func (x *TextFrame) GetRotatedBoundingBox() *NormalizedBoundingPoly {
 	return nil
 }
 
-func (x *TextFrame) GetTimeOffset() *duration.Duration {
+func (x *TextFrame) GetTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.TimeOffset
 	}
@@ -3262,7 +3262,7 @@ type ObjectTrackingFrame struct {
 	// The normalized bounding box location of this object track for the frame.
 	NormalizedBoundingBox *NormalizedBoundingBox `protobuf:"bytes,1,opt,name=normalized_bounding_box,json=normalizedBoundingBox,proto3" json:"normalized_bounding_box,omitempty"`
 	// The timestamp of the frame in microseconds.
-	TimeOffset *duration.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
+	TimeOffset *durationpb.Duration `protobuf:"bytes,2,opt,name=time_offset,json=timeOffset,proto3" json:"time_offset,omitempty"`
 }
 
 func (x *ObjectTrackingFrame) Reset() {
@@ -3304,7 +3304,7 @@ func (x *ObjectTrackingFrame) GetNormalizedBoundingBox() *NormalizedBoundingBox
 	return nil
 }
 
-func (x *ObjectTrackingFrame) GetTimeOffset() *duration.Duration {
+func (x *ObjectTrackingFrame) GetTimeOffset() *durationpb.Duration {
 	if x != nil {
 		return x.TimeOffset
 	}
@@ -4306,9 +4306,9 @@ var file_google_cloud_videointelligence_v1_video_intelligence_proto_goTypes = []
 	(*ObjectTrackingFrame)(nil),            // 43: google.cloud.videointelligence.v1.ObjectTrackingFrame
 	(*ObjectTrackingAnnotation)(nil),       // 44: google.cloud.videointelligence.v1.ObjectTrackingAnnotation
 	(*LogoRecognitionAnnotation)(nil),      // 45: google.cloud.videointelligence.v1.LogoRecognitionAnnotation
-	(*duration.Duration)(nil),              // 46: google.protobuf.Duration
+	(*durationpb.Duration)(nil),            // 46: google.protobuf.Duration
 	(*status.Status)(nil),                  // 47: google.rpc.Status
-	(*timestamp.Timestamp)(nil),            // 48: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),          // 48: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),          // 49: google.longrunning.Operation
 }
 var file_google_cloud_videointelligence_v1_video_intelligence_proto_depIdxs = []int32{
diff --git a/videointelligence/go.mod b/videointelligence/go.mod
index a210190af3e..92f6fb82a29 100644
--- a/videointelligence/go.mod
+++ b/videointelligence/go.mod
@@ -3,11 +3,12 @@ module cloud.google.com/go/videointelligence
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go v0.105.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -18,9 +19,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/videointelligence/go.sum b/videointelligence/go.sum
index 8784b2a0c77..a7c57802950 100644
--- a/videointelligence/go.sum
+++ b/videointelligence/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -39,6 +41,7 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
 github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
 github.com/googleapis/gax-go/v2 v2.6.0 h1:SXk3ABtQYDT/OH8jAyvEOQ58mgawq5C4o/4/89qN2ZU=
@@ -62,11 +65,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +82,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +99,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/vision/aliasshim/aliasshim.go b/vision/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/vision/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/vision/v2/apiv1/doc.go b/vision/v2/apiv1/doc.go
index 9c5836b0063..eba228bb68e 100644
--- a/vision/v2/apiv1/doc.go
+++ b/vision/v2/apiv1/doc.go
@@ -59,7 +59,7 @@
 //
 //	req := &visionpb.CreateProductSetRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#CreateProductSetRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#CreateProductSetRequest.
 //	}
 //	resp, err := c.CreateProductSet(ctx, req)
 //	if err != nil {
diff --git a/vision/v2/apiv1/image_annotator_client.go b/vision/v2/apiv1/image_annotator_client.go
index 459f5ad14c6..92baa9c2026 100644
--- a/vision/v2/apiv1/image_annotator_client.go
+++ b/vision/v2/apiv1/image_annotator_client.go
@@ -25,11 +25,11 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	visionpb "cloud.google.com/go/vision/v2/apiv1/visionpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/vision/v2/apiv1/image_annotator_client_example_test.go b/vision/v2/apiv1/image_annotator_client_example_test.go
index 559f1ffb859..115ca2fdfa6 100644
--- a/vision/v2/apiv1/image_annotator_client_example_test.go
+++ b/vision/v2/apiv1/image_annotator_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	vision "cloud.google.com/go/vision/v2/apiv1"
-	visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1"
+	visionpb "cloud.google.com/go/vision/v2/apiv1/visionpb"
 )
 
 func ExampleNewImageAnnotatorClient() {
@@ -55,7 +55,7 @@ func ExampleImageAnnotatorClient_BatchAnnotateImages() {
 
 	req := &visionpb.BatchAnnotateImagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#BatchAnnotateImagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#BatchAnnotateImagesRequest.
 	}
 	resp, err := c.BatchAnnotateImages(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleImageAnnotatorClient_BatchAnnotateFiles() {
 
 	req := &visionpb.BatchAnnotateFilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#BatchAnnotateFilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#BatchAnnotateFilesRequest.
 	}
 	resp, err := c.BatchAnnotateFiles(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleImageAnnotatorClient_AsyncBatchAnnotateImages() {
 
 	req := &visionpb.AsyncBatchAnnotateImagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#AsyncBatchAnnotateImagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#AsyncBatchAnnotateImagesRequest.
 	}
 	op, err := c.AsyncBatchAnnotateImages(ctx, req)
 	if err != nil {
@@ -135,7 +135,7 @@ func ExampleImageAnnotatorClient_AsyncBatchAnnotateFiles() {
 
 	req := &visionpb.AsyncBatchAnnotateFilesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#AsyncBatchAnnotateFilesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#AsyncBatchAnnotateFilesRequest.
 	}
 	op, err := c.AsyncBatchAnnotateFiles(ctx, req)
 	if err != nil {
diff --git a/vision/v2/apiv1/product_search_client.go b/vision/v2/apiv1/product_search_client.go
index f9887d98dd6..c1c039f32f6 100644
--- a/vision/v2/apiv1/product_search_client.go
+++ b/vision/v2/apiv1/product_search_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	visionpb "cloud.google.com/go/vision/v2/apiv1/visionpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/vision/v2/apiv1/product_search_client_example_test.go b/vision/v2/apiv1/product_search_client_example_test.go
index 5cf75ace3a6..07ca6516386 100644
--- a/vision/v2/apiv1/product_search_client_example_test.go
+++ b/vision/v2/apiv1/product_search_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	vision "cloud.google.com/go/vision/v2/apiv1"
+	visionpb "cloud.google.com/go/vision/v2/apiv1/visionpb"
 	"google.golang.org/api/iterator"
-	visionpb "google.golang.org/genproto/googleapis/cloud/vision/v1"
 )
 
 func ExampleNewProductSearchClient() {
@@ -56,7 +56,7 @@ func ExampleProductSearchClient_CreateProductSet() {
 
 	req := &visionpb.CreateProductSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#CreateProductSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#CreateProductSetRequest.
 	}
 	resp, err := c.CreateProductSet(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleProductSearchClient_ListProductSets() {
 
 	req := &visionpb.ListProductSetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#ListProductSetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#ListProductSetsRequest.
 	}
 	it := c.ListProductSets(ctx, req)
 	for {
@@ -112,7 +112,7 @@ func ExampleProductSearchClient_GetProductSet() {
 
 	req := &visionpb.GetProductSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#GetProductSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#GetProductSetRequest.
 	}
 	resp, err := c.GetProductSet(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleProductSearchClient_UpdateProductSet() {
 
 	req := &visionpb.UpdateProductSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#UpdateProductSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#UpdateProductSetRequest.
 	}
 	resp, err := c.UpdateProductSet(ctx, req)
 	if err != nil {
@@ -162,7 +162,7 @@ func ExampleProductSearchClient_DeleteProductSet() {
 
 	req := &visionpb.DeleteProductSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#DeleteProductSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#DeleteProductSetRequest.
 	}
 	err = c.DeleteProductSet(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleProductSearchClient_CreateProduct() {
 
 	req := &visionpb.CreateProductRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#CreateProductRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#CreateProductRequest.
 	}
 	resp, err := c.CreateProduct(ctx, req)
 	if err != nil {
@@ -210,7 +210,7 @@ func ExampleProductSearchClient_ListProducts() {
 
 	req := &visionpb.ListProductsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#ListProductsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#ListProductsRequest.
 	}
 	it := c.ListProducts(ctx, req)
 	for {
@@ -241,7 +241,7 @@ func ExampleProductSearchClient_GetProduct() {
 
 	req := &visionpb.GetProductRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#GetProductRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#GetProductRequest.
 	}
 	resp, err := c.GetProduct(ctx, req)
 	if err != nil {
@@ -266,7 +266,7 @@ func ExampleProductSearchClient_UpdateProduct() {
 
 	req := &visionpb.UpdateProductRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#UpdateProductRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#UpdateProductRequest.
 	}
 	resp, err := c.UpdateProduct(ctx, req)
 	if err != nil {
@@ -291,7 +291,7 @@ func ExampleProductSearchClient_DeleteProduct() {
 
 	req := &visionpb.DeleteProductRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#DeleteProductRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#DeleteProductRequest.
 	}
 	err = c.DeleteProduct(ctx, req)
 	if err != nil {
@@ -314,7 +314,7 @@ func ExampleProductSearchClient_CreateReferenceImage() {
 
 	req := &visionpb.CreateReferenceImageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#CreateReferenceImageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#CreateReferenceImageRequest.
 	}
 	resp, err := c.CreateReferenceImage(ctx, req)
 	if err != nil {
@@ -339,7 +339,7 @@ func ExampleProductSearchClient_DeleteReferenceImage() {
 
 	req := &visionpb.DeleteReferenceImageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#DeleteReferenceImageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#DeleteReferenceImageRequest.
 	}
 	err = c.DeleteReferenceImage(ctx, req)
 	if err != nil {
@@ -362,7 +362,7 @@ func ExampleProductSearchClient_ListReferenceImages() {
 
 	req := &visionpb.ListReferenceImagesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#ListReferenceImagesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#ListReferenceImagesRequest.
 	}
 	it := c.ListReferenceImages(ctx, req)
 	for {
@@ -393,7 +393,7 @@ func ExampleProductSearchClient_GetReferenceImage() {
 
 	req := &visionpb.GetReferenceImageRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#GetReferenceImageRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#GetReferenceImageRequest.
 	}
 	resp, err := c.GetReferenceImage(ctx, req)
 	if err != nil {
@@ -418,7 +418,7 @@ func ExampleProductSearchClient_AddProductToProductSet() {
 
 	req := &visionpb.AddProductToProductSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#AddProductToProductSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#AddProductToProductSetRequest.
 	}
 	err = c.AddProductToProductSet(ctx, req)
 	if err != nil {
@@ -441,7 +441,7 @@ func ExampleProductSearchClient_RemoveProductFromProductSet() {
 
 	req := &visionpb.RemoveProductFromProductSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#RemoveProductFromProductSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#RemoveProductFromProductSetRequest.
 	}
 	err = c.RemoveProductFromProductSet(ctx, req)
 	if err != nil {
@@ -464,7 +464,7 @@ func ExampleProductSearchClient_ListProductsInProductSet() {
 
 	req := &visionpb.ListProductsInProductSetRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#ListProductsInProductSetRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#ListProductsInProductSetRequest.
 	}
 	it := c.ListProductsInProductSet(ctx, req)
 	for {
@@ -495,7 +495,7 @@ func ExampleProductSearchClient_ImportProductSets() {
 
 	req := &visionpb.ImportProductSetsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#ImportProductSetsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#ImportProductSetsRequest.
 	}
 	op, err := c.ImportProductSets(ctx, req)
 	if err != nil {
@@ -525,7 +525,7 @@ func ExampleProductSearchClient_PurgeProducts() {
 
 	req := &visionpb.PurgeProductsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vision/v1#PurgeProductsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vision/v2/apiv1/visionpb#PurgeProductsRequest.
 	}
 	op, err := c.PurgeProducts(ctx, req)
 	if err != nil {
diff --git a/vision/v2/apiv1/visionpb/geometry.pb.go b/vision/v2/apiv1/visionpb/geometry.pb.go
index 95736af46d5..1de81cb58b7 100644
--- a/vision/v2/apiv1/visionpb/geometry.pb.go
+++ b/vision/v2/apiv1/visionpb/geometry.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/vision/v1/geometry.proto
 
 package visionpb
diff --git a/vision/v2/apiv1/visionpb/image_annotator.pb.go b/vision/v2/apiv1/visionpb/image_annotator.pb.go
index 1572ca3cef2..aca104f2db4 100644
--- a/vision/v2/apiv1/visionpb/image_annotator.pb.go
+++ b/vision/v2/apiv1/visionpb/image_annotator.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/vision/v1/image_annotator.proto
 
 package visionpb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -36,6 +35,7 @@ import (
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -3269,9 +3269,9 @@ type OperationMetadata struct {
 	// Current state of the batch operation.
 	State OperationMetadata_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.vision.v1.OperationMetadata_State" json:"state,omitempty"`
 	// The time when the batch request was received.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time when the operation result was last updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *OperationMetadata) Reset() {
@@ -3313,14 +3313,14 @@ func (x *OperationMetadata) GetState() OperationMetadata_State {
 	return OperationMetadata_STATE_UNSPECIFIED
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetUpdateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -4175,7 +4175,7 @@ var file_google_cloud_vision_v1_image_annotator_proto_goTypes = []interface{}{
 	(*WebDetection)(nil),                     // 49: google.cloud.vision.v1.WebDetection
 	(*ProductSearchResults)(nil),             // 50: google.cloud.vision.v1.ProductSearchResults
 	(*status.Status)(nil),                    // 51: google.rpc.Status
-	(*timestamp.Timestamp)(nil),              // 52: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),            // 52: google.protobuf.Timestamp
 	(*Position)(nil),                         // 53: google.cloud.vision.v1.Position
 	(*longrunning.Operation)(nil),            // 54: google.longrunning.Operation
 }
diff --git a/vision/v2/apiv1/visionpb/product_search.pb.go b/vision/v2/apiv1/visionpb/product_search.pb.go
index 0fe0e6faee1..2d0f1209a78 100644
--- a/vision/v2/apiv1/visionpb/product_search.pb.go
+++ b/vision/v2/apiv1/visionpb/product_search.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/vision/v1/product_search.proto
 
 package visionpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -139,7 +139,7 @@ type ProductSearchResults struct {
 	// Timestamp of the index which provided these results. Products added to the
 	// product set and products removed from the product set after this time are
 	// not reflected in the current results.
-	IndexTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=index_time,json=indexTime,proto3" json:"index_time,omitempty"`
+	IndexTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=index_time,json=indexTime,proto3" json:"index_time,omitempty"`
 	// List of results, one for each product match.
 	Results []*ProductSearchResults_Result `protobuf:"bytes,5,rep,name=results,proto3" json:"results,omitempty"`
 	// List of results grouped by products detected in the query image. Each entry
@@ -181,7 +181,7 @@ func (*ProductSearchResults) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vision_v1_product_search_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ProductSearchResults) GetIndexTime() *timestamp.Timestamp {
+func (x *ProductSearchResults) GetIndexTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.IndexTime
 	}
@@ -529,7 +529,7 @@ var file_google_cloud_vision_v1_product_search_proto_goTypes = []interface{}{
 	(*ProductSearchResults_ObjectAnnotation)(nil), // 3: google.cloud.vision.v1.ProductSearchResults.ObjectAnnotation
 	(*ProductSearchResults_GroupedResult)(nil),    // 4: google.cloud.vision.v1.ProductSearchResults.GroupedResult
 	(*BoundingPoly)(nil),                          // 5: google.cloud.vision.v1.BoundingPoly
-	(*timestamp.Timestamp)(nil),                   // 6: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                 // 6: google.protobuf.Timestamp
 	(*Product)(nil),                               // 7: google.cloud.vision.v1.Product
 }
 var file_google_cloud_vision_v1_product_search_proto_depIdxs = []int32{
diff --git a/vision/v2/apiv1/visionpb/product_search_service.pb.go b/vision/v2/apiv1/visionpb/product_search_service.pb.go
index 381e4694828..bf0f1e10c64 100644
--- a/vision/v2/apiv1/visionpb/product_search_service.pb.go
+++ b/vision/v2/apiv1/visionpb/product_search_service.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/vision/v1/product_search_service.proto
 
 package visionpb
@@ -25,17 +25,17 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -240,7 +240,7 @@ type ProductSet struct {
 	// "1970-01-01T00:00:00Z".
 	//
 	// This field is ignored when creating a ProductSet.
-	IndexTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=index_time,json=indexTime,proto3" json:"index_time,omitempty"`
+	IndexTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=index_time,json=indexTime,proto3" json:"index_time,omitempty"`
 	// Output only. If there was an error with indexing the product set, the field
 	// is populated.
 	//
@@ -294,7 +294,7 @@ func (x *ProductSet) GetDisplayName() string {
 	return ""
 }
 
-func (x *ProductSet) GetIndexTime() *timestamp.Timestamp {
+func (x *ProductSet) GetIndexTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.IndexTime
 	}
@@ -658,7 +658,7 @@ type UpdateProductRequest struct {
 	// If update_mask isn't specified, all mutable fields are to be updated.
 	// Valid mask paths include `product_labels`, `display_name`, and
 	// `description`.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateProductRequest) Reset() {
@@ -700,7 +700,7 @@ func (x *UpdateProductRequest) GetProduct() *Product {
 	return nil
 }
 
-func (x *UpdateProductRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateProductRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1023,7 +1023,7 @@ type UpdateProductSetRequest struct {
 	// update.
 	// If update_mask isn't specified, all mutable fields are to be updated.
 	// Valid mask path is `display_name`.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateProductSetRequest) Reset() {
@@ -1065,7 +1065,7 @@ func (x *UpdateProductSetRequest) GetProductSet() *ProductSet {
 	return nil
 }
 
-func (x *UpdateProductSetRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateProductSetRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -2020,10 +2020,10 @@ type BatchOperationMetadata struct {
 	// The current state of the batch operation.
 	State BatchOperationMetadata_State `protobuf:"varint,1,opt,name=state,proto3,enum=google.cloud.vision.v1.BatchOperationMetadata_State" json:"state,omitempty"`
 	// The time when the batch request was submitted to the server.
-	SubmitTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
+	SubmitTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=submit_time,json=submitTime,proto3" json:"submit_time,omitempty"`
 	// The time when the batch request is finished and
 	// [google.longrunning.Operation.done][google.longrunning.Operation.done] is set to true.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 }
 
 func (x *BatchOperationMetadata) Reset() {
@@ -2065,14 +2065,14 @@ func (x *BatchOperationMetadata) GetState() BatchOperationMetadata_State {
 	return BatchOperationMetadata_STATE_UNSPECIFIED
 }
 
-func (x *BatchOperationMetadata) GetSubmitTime() *timestamp.Timestamp {
+func (x *BatchOperationMetadata) GetSubmitTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.SubmitTime
 	}
 	return nil
 }
 
-func (x *BatchOperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *BatchOperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -2946,11 +2946,11 @@ var file_google_cloud_vision_v1_product_search_service_proto_goTypes = []interfa
 	(*ProductSetPurgeConfig)(nil),              // 30: google.cloud.vision.v1.ProductSetPurgeConfig
 	(*PurgeProductsRequest)(nil),               // 31: google.cloud.vision.v1.PurgeProductsRequest
 	(*Product_KeyValue)(nil),                   // 32: google.cloud.vision.v1.Product.KeyValue
-	(*timestamp.Timestamp)(nil),                // 33: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),              // 33: google.protobuf.Timestamp
 	(*status.Status)(nil),                      // 34: google.rpc.Status
 	(*BoundingPoly)(nil),                       // 35: google.cloud.vision.v1.BoundingPoly
-	(*field_mask.FieldMask)(nil),               // 36: google.protobuf.FieldMask
-	(*empty.Empty)(nil),                        // 37: google.protobuf.Empty
+	(*fieldmaskpb.FieldMask)(nil),              // 36: google.protobuf.FieldMask
+	(*emptypb.Empty)(nil),                      // 37: google.protobuf.Empty
 	(*longrunning.Operation)(nil),              // 38: google.longrunning.Operation
 }
 var file_google_cloud_vision_v1_product_search_service_proto_depIdxs = []int32{
@@ -3487,7 +3487,7 @@ type ProductSearchClient interface {
 	// ProductSet are not deleted.
 	//
 	// The actual image files are not deleted from Google Cloud Storage.
-	DeleteProductSet(ctx context.Context, in *DeleteProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteProductSet(ctx context.Context, in *DeleteProductSetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates and returns a new product resource.
 	//
 	// Possible errors:
@@ -3530,7 +3530,7 @@ type ProductSearchClient interface {
 	// Metadata of the product and all its images will be deleted right away, but
 	// search queries against ProductSets containing the product may still work
 	// until all related caches are refreshed.
-	DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Creates and returns a new ReferenceImage resource.
 	//
 	// The `bounding_poly` field is optional. If `bounding_poly` is not specified,
@@ -3558,7 +3558,7 @@ type ProductSearchClient interface {
 	// caches are refreshed.
 	//
 	// The actual image files are not deleted from Google Cloud Storage.
-	DeleteReferenceImage(ctx context.Context, in *DeleteReferenceImageRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteReferenceImage(ctx context.Context, in *DeleteReferenceImageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists reference images.
 	//
 	// Possible errors:
@@ -3581,9 +3581,9 @@ type ProductSearchClient interface {
 	// Possible errors:
 	//
 	// * Returns NOT_FOUND if the Product or the ProductSet doesn't exist.
-	AddProductToProductSet(ctx context.Context, in *AddProductToProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	AddProductToProductSet(ctx context.Context, in *AddProductToProductSetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Removes a Product from the specified ProductSet.
-	RemoveProductFromProductSet(ctx context.Context, in *RemoveProductFromProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	RemoveProductFromProductSet(ctx context.Context, in *RemoveProductFromProductSetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Lists the Products in a ProductSet, in an unspecified order. If the
 	// ProductSet does not exist, the products field of the response will be
 	// empty.
@@ -3675,8 +3675,8 @@ func (c *productSearchClient) UpdateProductSet(ctx context.Context, in *UpdatePr
 	return out, nil
 }
 
-func (c *productSearchClient) DeleteProductSet(ctx context.Context, in *DeleteProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *productSearchClient) DeleteProductSet(ctx context.Context, in *DeleteProductSetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1.ProductSearch/DeleteProductSet", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3720,8 +3720,8 @@ func (c *productSearchClient) UpdateProduct(ctx context.Context, in *UpdateProdu
 	return out, nil
 }
 
-func (c *productSearchClient) DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *productSearchClient) DeleteProduct(ctx context.Context, in *DeleteProductRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1.ProductSearch/DeleteProduct", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3738,8 +3738,8 @@ func (c *productSearchClient) CreateReferenceImage(ctx context.Context, in *Crea
 	return out, nil
 }
 
-func (c *productSearchClient) DeleteReferenceImage(ctx context.Context, in *DeleteReferenceImageRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *productSearchClient) DeleteReferenceImage(ctx context.Context, in *DeleteReferenceImageRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1.ProductSearch/DeleteReferenceImage", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3765,8 +3765,8 @@ func (c *productSearchClient) GetReferenceImage(ctx context.Context, in *GetRefe
 	return out, nil
 }
 
-func (c *productSearchClient) AddProductToProductSet(ctx context.Context, in *AddProductToProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *productSearchClient) AddProductToProductSet(ctx context.Context, in *AddProductToProductSetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1.ProductSearch/AddProductToProductSet", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3774,8 +3774,8 @@ func (c *productSearchClient) AddProductToProductSet(ctx context.Context, in *Ad
 	return out, nil
 }
 
-func (c *productSearchClient) RemoveProductFromProductSet(ctx context.Context, in *RemoveProductFromProductSetRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *productSearchClient) RemoveProductFromProductSet(ctx context.Context, in *RemoveProductFromProductSetRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.vision.v1.ProductSearch/RemoveProductFromProductSet", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -3845,7 +3845,7 @@ type ProductSearchServer interface {
 	// ProductSet are not deleted.
 	//
 	// The actual image files are not deleted from Google Cloud Storage.
-	DeleteProductSet(context.Context, *DeleteProductSetRequest) (*empty.Empty, error)
+	DeleteProductSet(context.Context, *DeleteProductSetRequest) (*emptypb.Empty, error)
 	// Creates and returns a new product resource.
 	//
 	// Possible errors:
@@ -3888,7 +3888,7 @@ type ProductSearchServer interface {
 	// Metadata of the product and all its images will be deleted right away, but
 	// search queries against ProductSets containing the product may still work
 	// until all related caches are refreshed.
-	DeleteProduct(context.Context, *DeleteProductRequest) (*empty.Empty, error)
+	DeleteProduct(context.Context, *DeleteProductRequest) (*emptypb.Empty, error)
 	// Creates and returns a new ReferenceImage resource.
 	//
 	// The `bounding_poly` field is optional. If `bounding_poly` is not specified,
@@ -3916,7 +3916,7 @@ type ProductSearchServer interface {
 	// caches are refreshed.
 	//
 	// The actual image files are not deleted from Google Cloud Storage.
-	DeleteReferenceImage(context.Context, *DeleteReferenceImageRequest) (*empty.Empty, error)
+	DeleteReferenceImage(context.Context, *DeleteReferenceImageRequest) (*emptypb.Empty, error)
 	// Lists reference images.
 	//
 	// Possible errors:
@@ -3939,9 +3939,9 @@ type ProductSearchServer interface {
 	// Possible errors:
 	//
 	// * Returns NOT_FOUND if the Product or the ProductSet doesn't exist.
-	AddProductToProductSet(context.Context, *AddProductToProductSetRequest) (*empty.Empty, error)
+	AddProductToProductSet(context.Context, *AddProductToProductSetRequest) (*emptypb.Empty, error)
 	// Removes a Product from the specified ProductSet.
-	RemoveProductFromProductSet(context.Context, *RemoveProductFromProductSetRequest) (*empty.Empty, error)
+	RemoveProductFromProductSet(context.Context, *RemoveProductFromProductSetRequest) (*emptypb.Empty, error)
 	// Lists the Products in a ProductSet, in an unspecified order. If the
 	// ProductSet does not exist, the products field of the response will be
 	// empty.
@@ -4005,7 +4005,7 @@ func (*UnimplementedProductSearchServer) GetProductSet(context.Context, *GetProd
 func (*UnimplementedProductSearchServer) UpdateProductSet(context.Context, *UpdateProductSetRequest) (*ProductSet, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method UpdateProductSet not implemented")
 }
-func (*UnimplementedProductSearchServer) DeleteProductSet(context.Context, *DeleteProductSetRequest) (*empty.Empty, error) {
+func (*UnimplementedProductSearchServer) DeleteProductSet(context.Context, *DeleteProductSetRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteProductSet not implemented")
 }
 func (*UnimplementedProductSearchServer) CreateProduct(context.Context, *CreateProductRequest) (*Product, error) {
@@ -4020,13 +4020,13 @@ func (*UnimplementedProductSearchServer) GetProduct(context.Context, *GetProduct
 func (*UnimplementedProductSearchServer) UpdateProduct(context.Context, *UpdateProductRequest) (*Product, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method UpdateProduct not implemented")
 }
-func (*UnimplementedProductSearchServer) DeleteProduct(context.Context, *DeleteProductRequest) (*empty.Empty, error) {
+func (*UnimplementedProductSearchServer) DeleteProduct(context.Context, *DeleteProductRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteProduct not implemented")
 }
 func (*UnimplementedProductSearchServer) CreateReferenceImage(context.Context, *CreateReferenceImageRequest) (*ReferenceImage, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method CreateReferenceImage not implemented")
 }
-func (*UnimplementedProductSearchServer) DeleteReferenceImage(context.Context, *DeleteReferenceImageRequest) (*empty.Empty, error) {
+func (*UnimplementedProductSearchServer) DeleteReferenceImage(context.Context, *DeleteReferenceImageRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method DeleteReferenceImage not implemented")
 }
 func (*UnimplementedProductSearchServer) ListReferenceImages(context.Context, *ListReferenceImagesRequest) (*ListReferenceImagesResponse, error) {
@@ -4035,10 +4035,10 @@ func (*UnimplementedProductSearchServer) ListReferenceImages(context.Context, *L
 func (*UnimplementedProductSearchServer) GetReferenceImage(context.Context, *GetReferenceImageRequest) (*ReferenceImage, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method GetReferenceImage not implemented")
 }
-func (*UnimplementedProductSearchServer) AddProductToProductSet(context.Context, *AddProductToProductSetRequest) (*empty.Empty, error) {
+func (*UnimplementedProductSearchServer) AddProductToProductSet(context.Context, *AddProductToProductSetRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method AddProductToProductSet not implemented")
 }
-func (*UnimplementedProductSearchServer) RemoveProductFromProductSet(context.Context, *RemoveProductFromProductSetRequest) (*empty.Empty, error) {
+func (*UnimplementedProductSearchServer) RemoveProductFromProductSet(context.Context, *RemoveProductFromProductSetRequest) (*emptypb.Empty, error) {
 	return nil, status1.Errorf(codes.Unimplemented, "method RemoveProductFromProductSet not implemented")
 }
 func (*UnimplementedProductSearchServer) ListProductsInProductSet(context.Context, *ListProductsInProductSetRequest) (*ListProductsInProductSetResponse, error) {
diff --git a/vision/v2/apiv1/visionpb/text_annotation.pb.go b/vision/v2/apiv1/visionpb/text_annotation.pb.go
index c9111f68843..f1fb81f1c47 100644
--- a/vision/v2/apiv1/visionpb/text_annotation.pb.go
+++ b/vision/v2/apiv1/visionpb/text_annotation.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/vision/v1/text_annotation.proto
 
 package visionpb
diff --git a/vision/v2/apiv1/visionpb/web_detection.pb.go b/vision/v2/apiv1/visionpb/web_detection.pb.go
index d8ff6f1a04a..8d116818616 100644
--- a/vision/v2/apiv1/visionpb/web_detection.pb.go
+++ b/vision/v2/apiv1/visionpb/web_detection.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/vision/v1/web_detection.proto
 
 package visionpb
diff --git a/vision/v2/go.mod b/vision/v2/go.mod
index 0e3a6465b6b..72d97cd5f3b 100644
--- a/vision/v2/go.mod
+++ b/vision/v2/go.mod
@@ -3,25 +3,26 @@ module cloud.google.com/go/vision/v2
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	cloud.google.com/go/vision v1.2.0
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/vision/v2/go.sum b/vision/v2/go.sum
index 0d2d6d2035a..b4a16868a41 100644
--- a/vision/v2/go.sum
+++ b/vision/v2/go.sum
@@ -27,8 +27,8 @@ cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW
 cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
 cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
 cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -41,6 +41,8 @@ cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5J
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -275,8 +277,8 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -293,8 +295,8 @@ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -369,8 +371,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -462,8 +465,8 @@ google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3h
 google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
 google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
 google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -536,8 +539,8 @@ google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ6
 google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
 google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
diff --git a/vmmigration/aliasshim/aliasshim.go b/vmmigration/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/vmmigration/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/vmmigration/apiv1/doc.go b/vmmigration/apiv1/doc.go
index 3644c0b0888..06c51627847 100644
--- a/vmmigration/apiv1/doc.go
+++ b/vmmigration/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &vmmigrationpb.ListSourcesRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListSourcesRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListSourcesRequest.
 //	}
 //	it := c.ListSources(ctx, req)
 //	for {
diff --git a/vmmigration/apiv1/vm_migration_client.go b/vmmigration/apiv1/vm_migration_client.go
index 0c91c20ce87..b4c1551d2cb 100644
--- a/vmmigration/apiv1/vm_migration_client.go
+++ b/vmmigration/apiv1/vm_migration_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	vmmigrationpb "cloud.google.com/go/vmmigration/apiv1/vmmigrationpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	vmmigrationpb "google.golang.org/genproto/googleapis/cloud/vmmigration/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/vmmigration/apiv1/vm_migration_client_example_test.go b/vmmigration/apiv1/vm_migration_client_example_test.go
index 1652f36495b..ba0b31006d7 100644
--- a/vmmigration/apiv1/vm_migration_client_example_test.go
+++ b/vmmigration/apiv1/vm_migration_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	vmmigration "cloud.google.com/go/vmmigration/apiv1"
+	vmmigrationpb "cloud.google.com/go/vmmigration/apiv1/vmmigrationpb"
 	"google.golang.org/api/iterator"
-	vmmigrationpb "google.golang.org/genproto/googleapis/cloud/vmmigration/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListSources() {
 
 	req := &vmmigrationpb.ListSourcesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListSourcesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListSourcesRequest.
 	}
 	it := c.ListSources(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetSource() {
 
 	req := &vmmigrationpb.GetSourceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#GetSourceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#GetSourceRequest.
 	}
 	resp, err := c.GetSource(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_CreateSource() {
 
 	req := &vmmigrationpb.CreateSourceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CreateSourceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CreateSourceRequest.
 	}
 	op, err := c.CreateSource(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleClient_UpdateSource() {
 
 	req := &vmmigrationpb.UpdateSourceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#UpdateSourceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#UpdateSourceRequest.
 	}
 	op, err := c.UpdateSource(ctx, req)
 	if err != nil {
@@ -172,7 +172,7 @@ func ExampleClient_DeleteSource() {
 
 	req := &vmmigrationpb.DeleteSourceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#DeleteSourceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#DeleteSourceRequest.
 	}
 	op, err := c.DeleteSource(ctx, req)
 	if err != nil {
@@ -200,7 +200,7 @@ func ExampleClient_FetchInventory() {
 
 	req := &vmmigrationpb.FetchInventoryRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#FetchInventoryRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#FetchInventoryRequest.
 	}
 	resp, err := c.FetchInventory(ctx, req)
 	if err != nil {
@@ -225,7 +225,7 @@ func ExampleClient_ListUtilizationReports() {
 
 	req := &vmmigrationpb.ListUtilizationReportsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListUtilizationReportsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListUtilizationReportsRequest.
 	}
 	it := c.ListUtilizationReports(ctx, req)
 	for {
@@ -256,7 +256,7 @@ func ExampleClient_GetUtilizationReport() {
 
 	req := &vmmigrationpb.GetUtilizationReportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#GetUtilizationReportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#GetUtilizationReportRequest.
 	}
 	resp, err := c.GetUtilizationReport(ctx, req)
 	if err != nil {
@@ -281,7 +281,7 @@ func ExampleClient_CreateUtilizationReport() {
 
 	req := &vmmigrationpb.CreateUtilizationReportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CreateUtilizationReportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CreateUtilizationReportRequest.
 	}
 	op, err := c.CreateUtilizationReport(ctx, req)
 	if err != nil {
@@ -311,7 +311,7 @@ func ExampleClient_DeleteUtilizationReport() {
 
 	req := &vmmigrationpb.DeleteUtilizationReportRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#DeleteUtilizationReportRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#DeleteUtilizationReportRequest.
 	}
 	op, err := c.DeleteUtilizationReport(ctx, req)
 	if err != nil {
@@ -339,7 +339,7 @@ func ExampleClient_ListDatacenterConnectors() {
 
 	req := &vmmigrationpb.ListDatacenterConnectorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListDatacenterConnectorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListDatacenterConnectorsRequest.
 	}
 	it := c.ListDatacenterConnectors(ctx, req)
 	for {
@@ -370,7 +370,7 @@ func ExampleClient_GetDatacenterConnector() {
 
 	req := &vmmigrationpb.GetDatacenterConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#GetDatacenterConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#GetDatacenterConnectorRequest.
 	}
 	resp, err := c.GetDatacenterConnector(ctx, req)
 	if err != nil {
@@ -395,7 +395,7 @@ func ExampleClient_CreateDatacenterConnector() {
 
 	req := &vmmigrationpb.CreateDatacenterConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CreateDatacenterConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CreateDatacenterConnectorRequest.
 	}
 	op, err := c.CreateDatacenterConnector(ctx, req)
 	if err != nil {
@@ -425,7 +425,7 @@ func ExampleClient_DeleteDatacenterConnector() {
 
 	req := &vmmigrationpb.DeleteDatacenterConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#DeleteDatacenterConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#DeleteDatacenterConnectorRequest.
 	}
 	op, err := c.DeleteDatacenterConnector(ctx, req)
 	if err != nil {
@@ -453,7 +453,7 @@ func ExampleClient_UpgradeAppliance() {
 
 	req := &vmmigrationpb.UpgradeApplianceRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#UpgradeApplianceRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#UpgradeApplianceRequest.
 	}
 	op, err := c.UpgradeAppliance(ctx, req)
 	if err != nil {
@@ -483,7 +483,7 @@ func ExampleClient_CreateMigratingVm() {
 
 	req := &vmmigrationpb.CreateMigratingVmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CreateMigratingVmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CreateMigratingVmRequest.
 	}
 	op, err := c.CreateMigratingVm(ctx, req)
 	if err != nil {
@@ -513,7 +513,7 @@ func ExampleClient_ListMigratingVms() {
 
 	req := &vmmigrationpb.ListMigratingVmsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListMigratingVmsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListMigratingVmsRequest.
 	}
 	it := c.ListMigratingVms(ctx, req)
 	for {
@@ -544,7 +544,7 @@ func ExampleClient_GetMigratingVm() {
 
 	req := &vmmigrationpb.GetMigratingVmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#GetMigratingVmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#GetMigratingVmRequest.
 	}
 	resp, err := c.GetMigratingVm(ctx, req)
 	if err != nil {
@@ -569,7 +569,7 @@ func ExampleClient_UpdateMigratingVm() {
 
 	req := &vmmigrationpb.UpdateMigratingVmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#UpdateMigratingVmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#UpdateMigratingVmRequest.
 	}
 	op, err := c.UpdateMigratingVm(ctx, req)
 	if err != nil {
@@ -599,7 +599,7 @@ func ExampleClient_DeleteMigratingVm() {
 
 	req := &vmmigrationpb.DeleteMigratingVmRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#DeleteMigratingVmRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#DeleteMigratingVmRequest.
 	}
 	op, err := c.DeleteMigratingVm(ctx, req)
 	if err != nil {
@@ -627,7 +627,7 @@ func ExampleClient_StartMigration() {
 
 	req := &vmmigrationpb.StartMigrationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#StartMigrationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#StartMigrationRequest.
 	}
 	op, err := c.StartMigration(ctx, req)
 	if err != nil {
@@ -657,7 +657,7 @@ func ExampleClient_ResumeMigration() {
 
 	req := &vmmigrationpb.ResumeMigrationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ResumeMigrationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ResumeMigrationRequest.
 	}
 	op, err := c.ResumeMigration(ctx, req)
 	if err != nil {
@@ -687,7 +687,7 @@ func ExampleClient_PauseMigration() {
 
 	req := &vmmigrationpb.PauseMigrationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#PauseMigrationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#PauseMigrationRequest.
 	}
 	op, err := c.PauseMigration(ctx, req)
 	if err != nil {
@@ -717,7 +717,7 @@ func ExampleClient_FinalizeMigration() {
 
 	req := &vmmigrationpb.FinalizeMigrationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#FinalizeMigrationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#FinalizeMigrationRequest.
 	}
 	op, err := c.FinalizeMigration(ctx, req)
 	if err != nil {
@@ -747,7 +747,7 @@ func ExampleClient_CreateCloneJob() {
 
 	req := &vmmigrationpb.CreateCloneJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CreateCloneJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CreateCloneJobRequest.
 	}
 	op, err := c.CreateCloneJob(ctx, req)
 	if err != nil {
@@ -777,7 +777,7 @@ func ExampleClient_CancelCloneJob() {
 
 	req := &vmmigrationpb.CancelCloneJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CancelCloneJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CancelCloneJobRequest.
 	}
 	op, err := c.CancelCloneJob(ctx, req)
 	if err != nil {
@@ -807,7 +807,7 @@ func ExampleClient_ListCloneJobs() {
 
 	req := &vmmigrationpb.ListCloneJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListCloneJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListCloneJobsRequest.
 	}
 	it := c.ListCloneJobs(ctx, req)
 	for {
@@ -838,7 +838,7 @@ func ExampleClient_GetCloneJob() {
 
 	req := &vmmigrationpb.GetCloneJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#GetCloneJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#GetCloneJobRequest.
 	}
 	resp, err := c.GetCloneJob(ctx, req)
 	if err != nil {
@@ -863,7 +863,7 @@ func ExampleClient_CreateCutoverJob() {
 
 	req := &vmmigrationpb.CreateCutoverJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CreateCutoverJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CreateCutoverJobRequest.
 	}
 	op, err := c.CreateCutoverJob(ctx, req)
 	if err != nil {
@@ -893,7 +893,7 @@ func ExampleClient_CancelCutoverJob() {
 
 	req := &vmmigrationpb.CancelCutoverJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CancelCutoverJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CancelCutoverJobRequest.
 	}
 	op, err := c.CancelCutoverJob(ctx, req)
 	if err != nil {
@@ -923,7 +923,7 @@ func ExampleClient_ListCutoverJobs() {
 
 	req := &vmmigrationpb.ListCutoverJobsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListCutoverJobsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListCutoverJobsRequest.
 	}
 	it := c.ListCutoverJobs(ctx, req)
 	for {
@@ -954,7 +954,7 @@ func ExampleClient_GetCutoverJob() {
 
 	req := &vmmigrationpb.GetCutoverJobRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#GetCutoverJobRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#GetCutoverJobRequest.
 	}
 	resp, err := c.GetCutoverJob(ctx, req)
 	if err != nil {
@@ -979,7 +979,7 @@ func ExampleClient_ListGroups() {
 
 	req := &vmmigrationpb.ListGroupsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListGroupsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListGroupsRequest.
 	}
 	it := c.ListGroups(ctx, req)
 	for {
@@ -1010,7 +1010,7 @@ func ExampleClient_GetGroup() {
 
 	req := &vmmigrationpb.GetGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#GetGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#GetGroupRequest.
 	}
 	resp, err := c.GetGroup(ctx, req)
 	if err != nil {
@@ -1035,7 +1035,7 @@ func ExampleClient_CreateGroup() {
 
 	req := &vmmigrationpb.CreateGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CreateGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CreateGroupRequest.
 	}
 	op, err := c.CreateGroup(ctx, req)
 	if err != nil {
@@ -1065,7 +1065,7 @@ func ExampleClient_UpdateGroup() {
 
 	req := &vmmigrationpb.UpdateGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#UpdateGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#UpdateGroupRequest.
 	}
 	op, err := c.UpdateGroup(ctx, req)
 	if err != nil {
@@ -1095,7 +1095,7 @@ func ExampleClient_DeleteGroup() {
 
 	req := &vmmigrationpb.DeleteGroupRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#DeleteGroupRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#DeleteGroupRequest.
 	}
 	op, err := c.DeleteGroup(ctx, req)
 	if err != nil {
@@ -1123,7 +1123,7 @@ func ExampleClient_AddGroupMigration() {
 
 	req := &vmmigrationpb.AddGroupMigrationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#AddGroupMigrationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#AddGroupMigrationRequest.
 	}
 	op, err := c.AddGroupMigration(ctx, req)
 	if err != nil {
@@ -1153,7 +1153,7 @@ func ExampleClient_RemoveGroupMigration() {
 
 	req := &vmmigrationpb.RemoveGroupMigrationRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#RemoveGroupMigrationRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#RemoveGroupMigrationRequest.
 	}
 	op, err := c.RemoveGroupMigration(ctx, req)
 	if err != nil {
@@ -1183,7 +1183,7 @@ func ExampleClient_ListTargetProjects() {
 
 	req := &vmmigrationpb.ListTargetProjectsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#ListTargetProjectsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#ListTargetProjectsRequest.
 	}
 	it := c.ListTargetProjects(ctx, req)
 	for {
@@ -1214,7 +1214,7 @@ func ExampleClient_GetTargetProject() {
 
 	req := &vmmigrationpb.GetTargetProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#GetTargetProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#GetTargetProjectRequest.
 	}
 	resp, err := c.GetTargetProject(ctx, req)
 	if err != nil {
@@ -1239,7 +1239,7 @@ func ExampleClient_CreateTargetProject() {
 
 	req := &vmmigrationpb.CreateTargetProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#CreateTargetProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#CreateTargetProjectRequest.
 	}
 	op, err := c.CreateTargetProject(ctx, req)
 	if err != nil {
@@ -1269,7 +1269,7 @@ func ExampleClient_UpdateTargetProject() {
 
 	req := &vmmigrationpb.UpdateTargetProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#UpdateTargetProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#UpdateTargetProjectRequest.
 	}
 	op, err := c.UpdateTargetProject(ctx, req)
 	if err != nil {
@@ -1299,7 +1299,7 @@ func ExampleClient_DeleteTargetProject() {
 
 	req := &vmmigrationpb.DeleteTargetProjectRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vmmigration/v1#DeleteTargetProjectRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vmmigration/apiv1/vmmigrationpb#DeleteTargetProjectRequest.
 	}
 	op, err := c.DeleteTargetProject(ctx, req)
 	if err != nil {
diff --git a/vmmigration/apiv1/vmmigrationpb/vmmigration.pb.go b/vmmigration/apiv1/vmmigrationpb/vmmigration.pb.go
index 52b0161d636..334f5d35150 100644
--- a/vmmigration/apiv1/vmmigrationpb/vmmigration.pb.go
+++ b/vmmigration/apiv1/vmmigrationpb/vmmigration.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/vmmigration/v1/vmmigration.proto
 
 package vmmigrationpb
@@ -25,18 +25,18 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	errdetails "google.golang.org/genproto/googleapis/rpc/errdetails"
 	status "google.golang.org/genproto/googleapis/rpc/status"
-	field_mask "google.golang.org/genproto/protobuf/field_mask"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status1 "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -1219,7 +1219,7 @@ type ReplicationCycle struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the replication cycle has started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The current progress in percentage of this cycle.
 	ProgressPercent int32 `protobuf:"varint,5,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 }
@@ -1256,7 +1256,7 @@ func (*ReplicationCycle) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{0}
 }
 
-func (x *ReplicationCycle) GetStartTime() *timestamp.Timestamp {
+func (x *ReplicationCycle) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -1278,7 +1278,7 @@ type ReplicationSync struct {
 
 	// The most updated snapshot created time in the source that finished
 	// replication.
-	LastSyncTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=last_sync_time,json=lastSyncTime,proto3" json:"last_sync_time,omitempty"`
+	LastSyncTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=last_sync_time,json=lastSyncTime,proto3" json:"last_sync_time,omitempty"`
 }
 
 func (x *ReplicationSync) Reset() {
@@ -1313,7 +1313,7 @@ func (*ReplicationSync) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ReplicationSync) GetLastSyncTime() *timestamp.Timestamp {
+func (x *ReplicationSync) GetLastSyncTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.LastSyncTime
 	}
@@ -1348,16 +1348,16 @@ type MigratingVm struct {
 	Policy *SchedulePolicy `protobuf:"bytes,8,opt,name=policy,proto3" json:"policy,omitempty"`
 	// Output only. The time the migrating VM was created (this refers to this
 	// resource and not to the time it was installed in the source).
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last time the migrating VM resource was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The most updated snapshot created time in the source that
 	// finished replication.
 	LastSync *ReplicationSync `protobuf:"bytes,11,opt,name=last_sync,json=lastSync,proto3" json:"last_sync,omitempty"`
 	// Output only. State of the MigratingVm.
 	State MigratingVm_State `protobuf:"varint,23,opt,name=state,proto3,enum=google.cloud.vmmigration.v1.MigratingVm_State" json:"state,omitempty"`
 	// Output only. The last time the migrating VM state was updated.
-	StateTime *timestamp.Timestamp `protobuf:"bytes,22,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
+	StateTime *timestamppb.Timestamp `protobuf:"bytes,22,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
 	// Output only. The percentage progress of the current running replication
 	// cycle.
 	CurrentSyncInfo *ReplicationCycle `protobuf:"bytes,13,opt,name=current_sync_info,json=currentSyncInfo,proto3" json:"current_sync_info,omitempty"`
@@ -1465,14 +1465,14 @@ func (x *MigratingVm) GetPolicy() *SchedulePolicy {
 	return nil
 }
 
-func (x *MigratingVm) GetCreateTime() *timestamp.Timestamp {
+func (x *MigratingVm) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *MigratingVm) GetUpdateTime() *timestamp.Timestamp {
+func (x *MigratingVm) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -1493,7 +1493,7 @@ func (x *MigratingVm) GetState() MigratingVm_State {
 	return MigratingVm_STATE_UNSPECIFIED
 }
 
-func (x *MigratingVm) GetStateTime() *timestamp.Timestamp {
+func (x *MigratingVm) GetStateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateTime
 	}
@@ -1576,15 +1576,15 @@ type CloneJob struct {
 	TargetVmDetails isCloneJob_TargetVmDetails `protobuf_oneof:"target_vm_details"`
 	// Output only. The time the clone job was created (as an API call, not when
 	// it was actually created in the target).
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the clone job was ended.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,22,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,22,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The name of the clone.
 	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. State of the clone job.
 	State CloneJob_State `protobuf:"varint,12,opt,name=state,proto3,enum=google.cloud.vmmigration.v1.CloneJob_State" json:"state,omitempty"`
 	// Output only. The time the state was last updated.
-	StateTime *timestamp.Timestamp `protobuf:"bytes,14,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
+	StateTime *timestamppb.Timestamp `protobuf:"bytes,14,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
 	// Output only. Provides details for the errors that led to the Clone Job's
 	// state.
 	Error *status.Status `protobuf:"bytes,17,opt,name=error,proto3" json:"error,omitempty"`
@@ -1636,14 +1636,14 @@ func (x *CloneJob) GetComputeEngineTargetDetails() *ComputeEngineTargetDetails {
 	return nil
 }
 
-func (x *CloneJob) GetCreateTime() *timestamp.Timestamp {
+func (x *CloneJob) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CloneJob) GetEndTime() *timestamp.Timestamp {
+func (x *CloneJob) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1664,7 +1664,7 @@ func (x *CloneJob) GetState() CloneJob_State {
 	return CloneJob_STATE_UNSPECIFIED
 }
 
-func (x *CloneJob) GetStateTime() *timestamp.Timestamp {
+func (x *CloneJob) GetStateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateTime
 	}
@@ -1705,15 +1705,15 @@ type CutoverJob struct {
 	TargetVmDetails isCutoverJob_TargetVmDetails `protobuf_oneof:"target_vm_details"`
 	// Output only. The time the cutover job was created (as an API call, not when
 	// it was actually created in the target).
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the cutover job had finished.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,16,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,16,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The name of the cutover job.
 	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. State of the cutover job.
 	State CutoverJob_State `protobuf:"varint,5,opt,name=state,proto3,enum=google.cloud.vmmigration.v1.CutoverJob_State" json:"state,omitempty"`
 	// Output only. The time the state was last updated.
-	StateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
+	StateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
 	// Output only. The current progress in percentage of the cutover job.
 	ProgressPercent int32 `protobuf:"varint,13,opt,name=progress_percent,json=progressPercent,proto3" json:"progress_percent,omitempty"`
 	// Output only. Provides details for the errors that led to the Cutover Job's
@@ -1770,14 +1770,14 @@ func (x *CutoverJob) GetComputeEngineTargetDetails() *ComputeEngineTargetDetails
 	return nil
 }
 
-func (x *CutoverJob) GetCreateTime() *timestamp.Timestamp {
+func (x *CutoverJob) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *CutoverJob) GetEndTime() *timestamp.Timestamp {
+func (x *CutoverJob) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1798,7 +1798,7 @@ func (x *CutoverJob) GetState() CutoverJob_State {
 	return CutoverJob_STATE_UNSPECIFIED
 }
 
-func (x *CutoverJob) GetStateTime() *timestamp.Timestamp {
+func (x *CutoverJob) GetStateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateTime
 	}
@@ -2236,9 +2236,9 @@ type Source struct {
 	// Output only. The Source name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The create time timestamp.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time timestamp.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// The labels of the source.
 	Labels map[string]string `protobuf:"bytes,4,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// User-provided description of the source.
@@ -2298,14 +2298,14 @@ func (x *Source) GetName() string {
 	return ""
 }
 
-func (x *Source) GetCreateTime() *timestamp.Timestamp {
+func (x *Source) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Source) GetUpdateTime() *timestamp.Timestamp {
+func (x *Source) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2425,9 +2425,9 @@ type DatacenterConnector struct {
 
 	// Output only. The time the connector was created (as an API call, not when
 	// it was actually installed).
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last time the connector was updated with an API call.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The connector's name.
 	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
 	// Immutable. A unique key for this connector. This key is internal to the OVA
@@ -2447,7 +2447,7 @@ type DatacenterConnector struct {
 	// checks.
 	State DatacenterConnector_State `protobuf:"varint,7,opt,name=state,proto3,enum=google.cloud.vmmigration.v1.DatacenterConnector_State" json:"state,omitempty"`
 	// Output only. The time the state was last set.
-	StateTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
+	StateTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
 	// Output only. Provides details on the state of the Datacenter Connector in
 	// case of an error.
 	Error *status.Status `protobuf:"bytes,11,opt,name=error,proto3" json:"error,omitempty"`
@@ -2497,14 +2497,14 @@ func (*DatacenterConnector) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{13}
 }
 
-func (x *DatacenterConnector) GetCreateTime() *timestamp.Timestamp {
+func (x *DatacenterConnector) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *DatacenterConnector) GetUpdateTime() *timestamp.Timestamp {
+func (x *DatacenterConnector) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -2553,7 +2553,7 @@ func (x *DatacenterConnector) GetState() DatacenterConnector_State {
 	return DatacenterConnector_STATE_UNSPECIFIED
 }
 
-func (x *DatacenterConnector) GetStateTime() *timestamp.Timestamp {
+func (x *DatacenterConnector) GetStateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateTime
 	}
@@ -2608,7 +2608,7 @@ type UpgradeStatus struct {
 	// Provides details on the state of the upgrade operation in case of an error.
 	Error *status.Status `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"`
 	// The time the operation was started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// The version from which we upgraded.
 	PreviousVersion string `protobuf:"bytes,5,opt,name=previous_version,json=previousVersion,proto3" json:"previous_version,omitempty"`
 }
@@ -2666,7 +2666,7 @@ func (x *UpgradeStatus) GetError() *status.Status {
 	return nil
 }
 
-func (x *UpgradeStatus) GetStartTime() *timestamp.Timestamp {
+func (x *UpgradeStatus) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
@@ -3126,7 +3126,7 @@ type UpdateSourceRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The update request body.
 	Source *Source `protobuf:"bytes,2,opt,name=source,proto3" json:"source,omitempty"`
 	// A request ID to identify requests. Specify a unique request ID
@@ -3177,7 +3177,7 @@ func (*UpdateSourceRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{21}
 }
 
-func (x *UpdateSourceRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateSourceRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -3541,7 +3541,7 @@ type FetchInventoryResponse struct {
 	SourceVms isFetchInventoryResponse_SourceVms `protobuf_oneof:"SourceVms"`
 	// Output only. The timestamp when the source was last queried (if the result
 	// is from the cache).
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *FetchInventoryResponse) Reset() {
@@ -3590,7 +3590,7 @@ func (x *FetchInventoryResponse) GetVmwareVms() *VmwareVmsDetails {
 	return nil
 }
 
-func (x *FetchInventoryResponse) GetUpdateTime() *timestamp.Timestamp {
+func (x *FetchInventoryResponse) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -3622,20 +3622,20 @@ type UtilizationReport struct {
 	// Output only. Current state of the report.
 	State UtilizationReport_State `protobuf:"varint,3,opt,name=state,proto3,enum=google.cloud.vmmigration.v1.UtilizationReport_State" json:"state,omitempty"`
 	// Output only. The time the state was last set.
-	StateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
+	StateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=state_time,json=stateTime,proto3" json:"state_time,omitempty"`
 	// Output only. Provides details on the state of the report in case of an
 	// error.
 	Error *status.Status `protobuf:"bytes,5,opt,name=error,proto3" json:"error,omitempty"`
 	// Output only. The time the report was created (this refers to the time of
 	// the request, not the time the report creation completed).
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Time frame of the report.
 	TimeFrame UtilizationReport_TimeFrame `protobuf:"varint,7,opt,name=time_frame,json=timeFrame,proto3,enum=google.cloud.vmmigration.v1.UtilizationReport_TimeFrame" json:"time_frame,omitempty"`
 	// Output only. The point in time when the time frame ends. Notice that the
 	// time frame is counted backwards. For instance if the "frame_end_time" value
 	// is 2021/01/20 and the time frame is WEEK then the report covers the week
 	// between 2021/01/20 and 2021/01/14.
-	FrameEndTime *timestamp.Timestamp `protobuf:"bytes,8,opt,name=frame_end_time,json=frameEndTime,proto3" json:"frame_end_time,omitempty"`
+	FrameEndTime *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=frame_end_time,json=frameEndTime,proto3" json:"frame_end_time,omitempty"`
 	// Output only. Total number of VMs included in the report.
 	VmCount int32 `protobuf:"varint,9,opt,name=vm_count,json=vmCount,proto3" json:"vm_count,omitempty"`
 	// List of utilization information per VM.
@@ -3698,7 +3698,7 @@ func (x *UtilizationReport) GetState() UtilizationReport_State {
 	return UtilizationReport_STATE_UNSPECIFIED
 }
 
-func (x *UtilizationReport) GetStateTime() *timestamp.Timestamp {
+func (x *UtilizationReport) GetStateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StateTime
 	}
@@ -3712,7 +3712,7 @@ func (x *UtilizationReport) GetError() *status.Status {
 	return nil
 }
 
-func (x *UtilizationReport) GetCreateTime() *timestamp.Timestamp {
+func (x *UtilizationReport) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
@@ -3726,7 +3726,7 @@ func (x *UtilizationReport) GetTimeFrame() UtilizationReport_TimeFrame {
 	return UtilizationReport_TIME_FRAME_UNSPECIFIED
 }
 
-func (x *UtilizationReport) GetFrameEndTime() *timestamp.Timestamp {
+func (x *UtilizationReport) GetFrameEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.FrameEndTime
 	}
@@ -5528,7 +5528,7 @@ type SchedulePolicy struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The idle duration between replication stages.
-	IdleDuration *duration.Duration `protobuf:"bytes,1,opt,name=idle_duration,json=idleDuration,proto3" json:"idle_duration,omitempty"`
+	IdleDuration *durationpb.Duration `protobuf:"bytes,1,opt,name=idle_duration,json=idleDuration,proto3" json:"idle_duration,omitempty"`
 	// A flag to indicate whether to skip OS adaptation during the replication
 	// sync. OS adaptation is a process where the VM's operating system undergoes
 	// changes and adaptations to fully function on Compute Engine.
@@ -5567,7 +5567,7 @@ func (*SchedulePolicy) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{48}
 }
 
-func (x *SchedulePolicy) GetIdleDuration() *duration.Duration {
+func (x *SchedulePolicy) GetIdleDuration() *durationpb.Duration {
 	if x != nil {
 		return x.IdleDuration
 	}
@@ -5907,7 +5907,7 @@ type UpdateMigratingVmRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The update request body.
 	MigratingVm *MigratingVm `protobuf:"bytes,2,opt,name=migrating_vm,json=migratingVm,proto3" json:"migrating_vm,omitempty"`
 	// A request ID to identify requests. Specify a unique request ID
@@ -5958,7 +5958,7 @@ func (*UpdateMigratingVmRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{53}
 }
 
-func (x *UpdateMigratingVmRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateMigratingVmRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -6395,9 +6395,9 @@ type TargetProject struct {
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Output only. The time this target project resource was created (not related
 	// to when the Compute Engine project it points to was created).
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last time the target project resource was updated.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 }
 
 func (x *TargetProject) Reset() {
@@ -6453,14 +6453,14 @@ func (x *TargetProject) GetDescription() string {
 	return ""
 }
 
-func (x *TargetProject) GetCreateTime() *timestamp.Timestamp {
+func (x *TargetProject) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *TargetProject) GetUpdateTime() *timestamp.Timestamp {
+func (x *TargetProject) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -6775,7 +6775,7 @@ type UpdateTargetProjectRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The update request body.
 	TargetProject *TargetProject `protobuf:"bytes,2,opt,name=target_project,json=targetProject,proto3" json:"target_project,omitempty"`
 	// A request ID to identify requests. Specify a unique request ID
@@ -6826,7 +6826,7 @@ func (*UpdateTargetProjectRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{68}
 }
 
-func (x *UpdateTargetProjectRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateTargetProjectRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -6927,9 +6927,9 @@ type Group struct {
 	// Output only. The Group name.
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. The create time timestamp.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The update time timestamp.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// User-provided description of the group.
 	Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"`
 	// Display name is a user defined name for this group which can be updated.
@@ -6975,14 +6975,14 @@ func (x *Group) GetName() string {
 	return ""
 }
 
-func (x *Group) GetCreateTime() *timestamp.Timestamp {
+func (x *Group) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Group) GetUpdateTime() *timestamp.Timestamp {
+func (x *Group) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
@@ -7311,7 +7311,7 @@ type UpdateGroupRequest struct {
 	// The fields specified in the update_mask are relative to the resource, not
 	// the full request. A field will be overwritten if it is in the mask. If the
 	// user does not provide a mask then all fields will be overwritten.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,1,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 	// Required. The update request body.
 	Group *Group `protobuf:"bytes,2,opt,name=group,proto3" json:"group,omitempty"`
 	// A request ID to identify requests. Specify a unique request ID
@@ -7362,7 +7362,7 @@ func (*UpdateGroupRequest) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{75}
 }
 
-func (x *UpdateGroupRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateGroupRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -8039,9 +8039,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Output only. The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Output only. Name of the verb executed by the operation.
@@ -8090,14 +8090,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_vmmigration_v1_vmmigration_proto_rawDescGZIP(), []int{87}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -8157,7 +8157,7 @@ type MigrationError struct {
 	// current error.
 	HelpLinks []*errdetails.Help_Link `protobuf:"bytes,4,rep,name=help_links,json=helpLinks,proto3" json:"help_links,omitempty"`
 	// Output only. The time the error occurred.
-	ErrorTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=error_time,json=errorTime,proto3" json:"error_time,omitempty"`
+	ErrorTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=error_time,json=errorTime,proto3" json:"error_time,omitempty"`
 }
 
 func (x *MigrationError) Reset() {
@@ -8220,7 +8220,7 @@ func (x *MigrationError) GetHelpLinks() []*errdetails.Help_Link {
 	return nil
 }
 
-func (x *MigrationError) GetErrorTime() *timestamp.Timestamp {
+func (x *MigrationError) GetErrorTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ErrorTime
 	}
@@ -10541,10 +10541,10 @@ var file_google_cloud_vmmigration_v1_vmmigration_proto_goTypes = []interface{}{
 	nil,                                      // 111: google.cloud.vmmigration.v1.ComputeEngineTargetDefaults.MetadataEntry
 	nil,                                      // 112: google.cloud.vmmigration.v1.ComputeEngineTargetDetails.LabelsEntry
 	nil,                                      // 113: google.cloud.vmmigration.v1.ComputeEngineTargetDetails.MetadataEntry
-	(*timestamp.Timestamp)(nil),              // 114: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),            // 114: google.protobuf.Timestamp
 	(*status.Status)(nil),                    // 115: google.rpc.Status
-	(*field_mask.FieldMask)(nil),             // 116: google.protobuf.FieldMask
-	(*duration.Duration)(nil),                // 117: google.protobuf.Duration
+	(*fieldmaskpb.FieldMask)(nil),            // 116: google.protobuf.FieldMask
+	(*durationpb.Duration)(nil),              // 117: google.protobuf.Duration
 	(*errdetails.LocalizedMessage)(nil),      // 118: google.rpc.LocalizedMessage
 	(*errdetails.Help_Link)(nil),             // 119: google.rpc.Help.Link
 	(*longrunning.Operation)(nil),            // 120: google.longrunning.Operation
diff --git a/vmmigration/go.mod b/vmmigration/go.mod
index 574d1f6d6bc..3f818f3d2da 100644
--- a/vmmigration/go.mod
+++ b/vmmigration/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/vmmigration
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/vmmigration/go.sum b/vmmigration/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/vmmigration/go.sum
+++ b/vmmigration/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/vpcaccess/aliasshim/aliasshim.go b/vpcaccess/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/vpcaccess/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/vpcaccess/apiv1/doc.go b/vpcaccess/apiv1/doc.go
index a14916bc547..5552d9f550c 100644
--- a/vpcaccess/apiv1/doc.go
+++ b/vpcaccess/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &vpcaccesspb.CreateConnectorRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vpcaccess/v1#CreateConnectorRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/vpcaccess/apiv1/vpcaccesspb#CreateConnectorRequest.
 //	}
 //	op, err := c.CreateConnector(ctx, req)
 //	if err != nil {
diff --git a/vpcaccess/apiv1/vpc_access_client.go b/vpcaccess/apiv1/vpc_access_client.go
index a5212422a77..e23392635fd 100644
--- a/vpcaccess/apiv1/vpc_access_client.go
+++ b/vpcaccess/apiv1/vpc_access_client.go
@@ -25,13 +25,13 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	vpcaccesspb "cloud.google.com/go/vpcaccess/apiv1/vpcaccesspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
-	vpcaccesspb "google.golang.org/genproto/googleapis/cloud/vpcaccess/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/vpcaccess/apiv1/vpc_access_client_example_test.go b/vpcaccess/apiv1/vpc_access_client_example_test.go
index 539f4f6ec97..41ab3e636c5 100644
--- a/vpcaccess/apiv1/vpc_access_client_example_test.go
+++ b/vpcaccess/apiv1/vpc_access_client_example_test.go
@@ -20,9 +20,9 @@ import (
 	"context"
 
 	vpcaccess "cloud.google.com/go/vpcaccess/apiv1"
+	vpcaccesspb "cloud.google.com/go/vpcaccess/apiv1/vpcaccesspb"
 	"google.golang.org/api/iterator"
 	locationpb "google.golang.org/genproto/googleapis/cloud/location"
-	vpcaccesspb "google.golang.org/genproto/googleapis/cloud/vpcaccess/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 )
 
@@ -58,7 +58,7 @@ func ExampleClient_CreateConnector() {
 
 	req := &vpcaccesspb.CreateConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vpcaccess/v1#CreateConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vpcaccess/apiv1/vpcaccesspb#CreateConnectorRequest.
 	}
 	op, err := c.CreateConnector(ctx, req)
 	if err != nil {
@@ -88,7 +88,7 @@ func ExampleClient_GetConnector() {
 
 	req := &vpcaccesspb.GetConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vpcaccess/v1#GetConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vpcaccess/apiv1/vpcaccesspb#GetConnectorRequest.
 	}
 	resp, err := c.GetConnector(ctx, req)
 	if err != nil {
@@ -113,7 +113,7 @@ func ExampleClient_ListConnectors() {
 
 	req := &vpcaccesspb.ListConnectorsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vpcaccess/v1#ListConnectorsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vpcaccess/apiv1/vpcaccesspb#ListConnectorsRequest.
 	}
 	it := c.ListConnectors(ctx, req)
 	for {
@@ -144,7 +144,7 @@ func ExampleClient_DeleteConnector() {
 
 	req := &vpcaccesspb.DeleteConnectorRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/vpcaccess/v1#DeleteConnectorRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/vpcaccess/apiv1/vpcaccesspb#DeleteConnectorRequest.
 	}
 	op, err := c.DeleteConnector(ctx, req)
 	if err != nil {
diff --git a/vpcaccess/apiv1/vpcaccesspb/vpc_access.pb.go b/vpcaccess/apiv1/vpcaccesspb/vpc_access.pb.go
index 9fb44ee2d97..afc66052f86 100644
--- a/vpcaccess/apiv1/vpcaccesspb/vpc_access.pb.go
+++ b/vpcaccess/apiv1/vpcaccesspb/vpc_access.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/vpcaccess/v1/vpc_access.proto
 
 package vpcaccesspb
@@ -25,7 +25,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
@@ -33,6 +32,7 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -548,9 +548,9 @@ type OperationMetadata struct {
 	// google.cloud.vpcaccess.v1.Connectors.CreateConnector.
 	Method string `protobuf:"bytes,1,opt,name=method,proto3" json:"method,omitempty"`
 	// Output only. Time when the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. Time when the operation completed.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Name of the resource that this operation is acting on e.g.
 	// projects/my-project/locations/us-central1/connectors/v1.
 	Target string `protobuf:"bytes,5,opt,name=target,proto3" json:"target,omitempty"`
@@ -595,14 +595,14 @@ func (x *OperationMetadata) GetMethod() string {
 	return ""
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -897,7 +897,7 @@ var file_google_cloud_vpcaccess_v1_vpc_access_proto_goTypes = []interface{}{
 	(*DeleteConnectorRequest)(nil), // 6: google.cloud.vpcaccess.v1.DeleteConnectorRequest
 	(*OperationMetadata)(nil),      // 7: google.cloud.vpcaccess.v1.OperationMetadata
 	(*Connector_Subnet)(nil),       // 8: google.cloud.vpcaccess.v1.Connector.Subnet
-	(*timestamp.Timestamp)(nil),    // 9: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),  // 9: google.protobuf.Timestamp
 	(*longrunning.Operation)(nil),  // 10: google.longrunning.Operation
 }
 var file_google_cloud_vpcaccess_v1_vpc_access_proto_depIdxs = []int32{
diff --git a/vpcaccess/go.mod b/vpcaccess/go.mod
index 984456c45ce..79e3528de80 100644
--- a/vpcaccess/go.mod
+++ b/vpcaccess/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/vpcaccess
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
-	github.com/golang/protobuf v1.5.2
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/vpcaccess/go.sum b/vpcaccess/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/vpcaccess/go.sum
+++ b/vpcaccess/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/webrisk/apiv1/doc.go b/webrisk/apiv1/doc.go
index b797809496c..87b7a55972b 100644
--- a/webrisk/apiv1/doc.go
+++ b/webrisk/apiv1/doc.go
@@ -55,7 +55,7 @@
 //
 //	req := &webriskpb.ComputeThreatListDiffRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/webrisk/v1#ComputeThreatListDiffRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/webrisk/apiv1/webriskpb#ComputeThreatListDiffRequest.
 //	}
 //	resp, err := c.ComputeThreatListDiff(ctx, req)
 //	if err != nil {
diff --git a/webrisk/apiv1/web_risk_client.go b/webrisk/apiv1/web_risk_client.go
index 2d5328792f8..69ddfd08522 100644
--- a/webrisk/apiv1/web_risk_client.go
+++ b/webrisk/apiv1/web_risk_client.go
@@ -23,11 +23,11 @@ import (
 	"net/url"
 	"time"
 
+	webriskpb "cloud.google.com/go/webrisk/apiv1/webriskpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	webriskpb "google.golang.org/genproto/googleapis/cloud/webrisk/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/webrisk/apiv1/web_risk_client_example_test.go b/webrisk/apiv1/web_risk_client_example_test.go
index dcaa3d706f1..9d65eb3025d 100644
--- a/webrisk/apiv1/web_risk_client_example_test.go
+++ b/webrisk/apiv1/web_risk_client_example_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 
 	webrisk "cloud.google.com/go/webrisk/apiv1"
-	webriskpb "google.golang.org/genproto/googleapis/cloud/webrisk/v1"
+	webriskpb "cloud.google.com/go/webrisk/apiv1/webriskpb"
 )
 
 func ExampleNewClient() {
@@ -55,7 +55,7 @@ func ExampleClient_ComputeThreatListDiff() {
 
 	req := &webriskpb.ComputeThreatListDiffRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/webrisk/v1#ComputeThreatListDiffRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/webrisk/apiv1/webriskpb#ComputeThreatListDiffRequest.
 	}
 	resp, err := c.ComputeThreatListDiff(ctx, req)
 	if err != nil {
@@ -80,7 +80,7 @@ func ExampleClient_SearchUris() {
 
 	req := &webriskpb.SearchUrisRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/webrisk/v1#SearchUrisRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/webrisk/apiv1/webriskpb#SearchUrisRequest.
 	}
 	resp, err := c.SearchUris(ctx, req)
 	if err != nil {
@@ -105,7 +105,7 @@ func ExampleClient_SearchHashes() {
 
 	req := &webriskpb.SearchHashesRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/webrisk/v1#SearchHashesRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/webrisk/apiv1/webriskpb#SearchHashesRequest.
 	}
 	resp, err := c.SearchHashes(ctx, req)
 	if err != nil {
@@ -130,7 +130,7 @@ func ExampleClient_CreateSubmission() {
 
 	req := &webriskpb.CreateSubmissionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/webrisk/v1#CreateSubmissionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/webrisk/apiv1/webriskpb#CreateSubmissionRequest.
 	}
 	resp, err := c.CreateSubmission(ctx, req)
 	if err != nil {
diff --git a/webrisk/apiv1/webriskpb/webrisk.pb.go b/webrisk/apiv1/webriskpb/webrisk.pb.go
index d26e6638003..764306e193e 100644
--- a/webrisk/apiv1/webriskpb/webrisk.pb.go
+++ b/webrisk/apiv1/webriskpb/webrisk.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/webrisk/v1/webrisk.proto
 
 package webriskpb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -311,7 +311,7 @@ type ComputeThreatListDiffResponse struct {
 	// request. Querying sooner is unlikely to produce a meaningful diff.
 	// Waiting longer is acceptable considering the use case.
 	// If this field is not set clients may update as soon as they want.
-	RecommendedNextDiff *timestamp.Timestamp `protobuf:"bytes,2,opt,name=recommended_next_diff,json=recommendedNextDiff,proto3" json:"recommended_next_diff,omitempty"`
+	RecommendedNextDiff *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=recommended_next_diff,json=recommendedNextDiff,proto3" json:"recommended_next_diff,omitempty"`
 }
 
 func (x *ComputeThreatListDiffResponse) Reset() {
@@ -381,7 +381,7 @@ func (x *ComputeThreatListDiffResponse) GetChecksum() *ComputeThreatListDiffResp
 	return nil
 }
 
-func (x *ComputeThreatListDiffResponse) GetRecommendedNextDiff() *timestamp.Timestamp {
+func (x *ComputeThreatListDiffResponse) GetRecommendedNextDiff() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RecommendedNextDiff
 	}
@@ -565,7 +565,7 @@ type SearchHashesResponse struct {
 	Threats []*SearchHashesResponse_ThreatHash `protobuf:"bytes,1,rep,name=threats,proto3" json:"threats,omitempty"`
 	// For requested entities that did not match the threat list, how long to
 	// cache the response until.
-	NegativeExpireTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=negative_expire_time,json=negativeExpireTime,proto3" json:"negative_expire_time,omitempty"`
+	NegativeExpireTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=negative_expire_time,json=negativeExpireTime,proto3" json:"negative_expire_time,omitempty"`
 }
 
 func (x *SearchHashesResponse) Reset() {
@@ -607,7 +607,7 @@ func (x *SearchHashesResponse) GetThreats() []*SearchHashesResponse_ThreatHash {
 	return nil
 }
 
-func (x *SearchHashesResponse) GetNegativeExpireTime() *timestamp.Timestamp {
+func (x *SearchHashesResponse) GetNegativeExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.NegativeExpireTime
 	}
@@ -1176,7 +1176,7 @@ type SearchUrisResponse_ThreatUri struct {
 	ThreatTypes []ThreatType `protobuf:"varint,1,rep,packed,name=threat_types,json=threatTypes,proto3,enum=google.cloud.webrisk.v1.ThreatType" json:"threat_types,omitempty"`
 	// The cache lifetime for the returned match. Clients must not cache this
 	// response past this timestamp to avoid false positives.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *SearchUrisResponse_ThreatUri) Reset() {
@@ -1218,7 +1218,7 @@ func (x *SearchUrisResponse_ThreatUri) GetThreatTypes() []ThreatType {
 	return nil
 }
 
-func (x *SearchUrisResponse_ThreatUri) GetExpireTime() *timestamp.Timestamp {
+func (x *SearchUrisResponse_ThreatUri) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -1239,7 +1239,7 @@ type SearchHashesResponse_ThreatHash struct {
 	Hash []byte `protobuf:"bytes,2,opt,name=hash,proto3" json:"hash,omitempty"`
 	// The cache lifetime for the returned match. Clients must not cache this
 	// response past this timestamp to avoid false positives.
-	ExpireTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	ExpireTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *SearchHashesResponse_ThreatHash) Reset() {
@@ -1288,7 +1288,7 @@ func (x *SearchHashesResponse_ThreatHash) GetHash() []byte {
 	return nil
 }
 
-func (x *SearchHashesResponse_ThreatHash) GetExpireTime() *timestamp.Timestamp {
+func (x *SearchHashesResponse_ThreatHash) GetExpireTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ExpireTime
 	}
@@ -1598,7 +1598,7 @@ var file_google_cloud_webrisk_v1_webrisk_proto_goTypes = []interface{}{
 	(*ComputeThreatListDiffResponse_Checksum)(nil),   // 17: google.cloud.webrisk.v1.ComputeThreatListDiffResponse.Checksum
 	(*SearchUrisResponse_ThreatUri)(nil),             // 18: google.cloud.webrisk.v1.SearchUrisResponse.ThreatUri
 	(*SearchHashesResponse_ThreatHash)(nil),          // 19: google.cloud.webrisk.v1.SearchHashesResponse.ThreatHash
-	(*timestamp.Timestamp)(nil),                      // 20: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                    // 20: google.protobuf.Timestamp
 }
 var file_google_cloud_webrisk_v1_webrisk_proto_depIdxs = []int32{
 	0,  // 0: google.cloud.webrisk.v1.ComputeThreatListDiffRequest.threat_type:type_name -> google.cloud.webrisk.v1.ThreatType
diff --git a/webrisk/go.mod b/webrisk/go.mod
index 8aeda3a378d..44a4aba00d5 100644
--- a/webrisk/go.mod
+++ b/webrisk/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -17,9 +17,9 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/webrisk/go.sum b/webrisk/go.sum
index 1f519d1c0a2..b16568229fc 100644
--- a/webrisk/go.sum
+++ b/webrisk/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a h1:GH6UPn3ixhWcKDhpnEC55S75cerLPdpp3hrhfKYjZgw=
-google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/websecurityscanner/aliasshim/aliasshim.go b/websecurityscanner/aliasshim/aliasshim.go
new file mode 100644
index 00000000000..0a02061ceeb
--- /dev/null
+++ b/websecurityscanner/aliasshim/aliasshim.go
@@ -0,0 +1,24 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by gapicgen. DO NOT EDIT.
+
+//go:build aliasshim
+// +build aliasshim
+
+// Package aliasshim is used to keep the dependency on go-genproto during our
+// go-genproto to google-cloud-go stubs migration window.
+package aliasshim
+
+import _ "google.golang.org/genproto/protobuf/api"
diff --git a/websecurityscanner/apiv1/doc.go b/websecurityscanner/apiv1/doc.go
index 167143bae7c..4d3251c173e 100644
--- a/websecurityscanner/apiv1/doc.go
+++ b/websecurityscanner/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &websecurityscannerpb.CreateScanConfigRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#CreateScanConfigRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#CreateScanConfigRequest.
 //	}
 //	resp, err := c.CreateScanConfig(ctx, req)
 //	if err != nil {
diff --git a/websecurityscanner/apiv1/web_security_scanner_client.go b/websecurityscanner/apiv1/web_security_scanner_client.go
index ce3215c3995..e5792e1b6fe 100644
--- a/websecurityscanner/apiv1/web_security_scanner_client.go
+++ b/websecurityscanner/apiv1/web_security_scanner_client.go
@@ -23,12 +23,12 @@ import (
 	"net/url"
 	"time"
 
+	websecurityscannerpb "cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	websecurityscannerpb "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/websecurityscanner/apiv1/web_security_scanner_client_example_test.go b/websecurityscanner/apiv1/web_security_scanner_client_example_test.go
index 448f8b94f02..11fc07d72ad 100644
--- a/websecurityscanner/apiv1/web_security_scanner_client_example_test.go
+++ b/websecurityscanner/apiv1/web_security_scanner_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	websecurityscanner "cloud.google.com/go/websecurityscanner/apiv1"
+	websecurityscannerpb "cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb"
 	"google.golang.org/api/iterator"
-	websecurityscannerpb "google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_CreateScanConfig() {
 
 	req := &websecurityscannerpb.CreateScanConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#CreateScanConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#CreateScanConfigRequest.
 	}
 	resp, err := c.CreateScanConfig(ctx, req)
 	if err != nil {
@@ -81,7 +81,7 @@ func ExampleClient_DeleteScanConfig() {
 
 	req := &websecurityscannerpb.DeleteScanConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#DeleteScanConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#DeleteScanConfigRequest.
 	}
 	err = c.DeleteScanConfig(ctx, req)
 	if err != nil {
@@ -104,7 +104,7 @@ func ExampleClient_GetScanConfig() {
 
 	req := &websecurityscannerpb.GetScanConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#GetScanConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#GetScanConfigRequest.
 	}
 	resp, err := c.GetScanConfig(ctx, req)
 	if err != nil {
@@ -129,7 +129,7 @@ func ExampleClient_ListScanConfigs() {
 
 	req := &websecurityscannerpb.ListScanConfigsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#ListScanConfigsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#ListScanConfigsRequest.
 	}
 	it := c.ListScanConfigs(ctx, req)
 	for {
@@ -160,7 +160,7 @@ func ExampleClient_UpdateScanConfig() {
 
 	req := &websecurityscannerpb.UpdateScanConfigRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#UpdateScanConfigRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#UpdateScanConfigRequest.
 	}
 	resp, err := c.UpdateScanConfig(ctx, req)
 	if err != nil {
@@ -185,7 +185,7 @@ func ExampleClient_StartScanRun() {
 
 	req := &websecurityscannerpb.StartScanRunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#StartScanRunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#StartScanRunRequest.
 	}
 	resp, err := c.StartScanRun(ctx, req)
 	if err != nil {
@@ -210,7 +210,7 @@ func ExampleClient_GetScanRun() {
 
 	req := &websecurityscannerpb.GetScanRunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#GetScanRunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#GetScanRunRequest.
 	}
 	resp, err := c.GetScanRun(ctx, req)
 	if err != nil {
@@ -235,7 +235,7 @@ func ExampleClient_ListScanRuns() {
 
 	req := &websecurityscannerpb.ListScanRunsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#ListScanRunsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#ListScanRunsRequest.
 	}
 	it := c.ListScanRuns(ctx, req)
 	for {
@@ -266,7 +266,7 @@ func ExampleClient_StopScanRun() {
 
 	req := &websecurityscannerpb.StopScanRunRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#StopScanRunRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#StopScanRunRequest.
 	}
 	resp, err := c.StopScanRun(ctx, req)
 	if err != nil {
@@ -291,7 +291,7 @@ func ExampleClient_ListCrawledUrls() {
 
 	req := &websecurityscannerpb.ListCrawledUrlsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#ListCrawledUrlsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#ListCrawledUrlsRequest.
 	}
 	it := c.ListCrawledUrls(ctx, req)
 	for {
@@ -322,7 +322,7 @@ func ExampleClient_GetFinding() {
 
 	req := &websecurityscannerpb.GetFindingRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#GetFindingRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#GetFindingRequest.
 	}
 	resp, err := c.GetFinding(ctx, req)
 	if err != nil {
@@ -347,7 +347,7 @@ func ExampleClient_ListFindings() {
 
 	req := &websecurityscannerpb.ListFindingsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#ListFindingsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#ListFindingsRequest.
 	}
 	it := c.ListFindings(ctx, req)
 	for {
@@ -378,7 +378,7 @@ func ExampleClient_ListFindingTypeStats() {
 
 	req := &websecurityscannerpb.ListFindingTypeStatsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/websecurityscanner/v1#ListFindingTypeStatsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/websecurityscanner/apiv1/websecurityscannerpb#ListFindingTypeStatsRequest.
 	}
 	resp, err := c.ListFindingTypeStats(ctx, req)
 	if err != nil {
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/crawled_url.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/crawled_url.pb.go
index 1a3f938b684..57dc6b3f837 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/crawled_url.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/crawled_url.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/crawled_url.proto
 
 package websecurityscannerpb
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/finding.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/finding.pb.go
index 3e58d8ad59a..a486738de80 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/finding.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/finding.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/finding.proto
 
 package websecurityscannerpb
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/finding_addon.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/finding_addon.pb.go
index 5d4a3561903..9dde37398d2 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/finding_addon.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/finding_addon.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/finding_addon.proto
 
 package websecurityscannerpb
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/finding_type_stats.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/finding_type_stats.pb.go
index f0bec40f5e1..3f9955ccd99 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/finding_type_stats.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/finding_type_stats.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/finding_type_stats.proto
 
 package websecurityscannerpb
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/scan_config.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/scan_config.pb.go
index 912a97d72ac..37e89ad77d4 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/scan_config.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/scan_config.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/scan_config.proto
 
 package websecurityscannerpb
@@ -24,10 +24,10 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -485,7 +485,7 @@ type ScanConfig_Schedule struct {
 	// refreshed by the server after each run. If unspecified, it will default
 	// to current server time, which means the scan will be scheduled to start
 	// immediately.
-	ScheduleTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
+	ScheduleTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=schedule_time,json=scheduleTime,proto3" json:"schedule_time,omitempty"`
 	// Required. The duration of time between executions in days.
 	IntervalDurationDays int32 `protobuf:"varint,2,opt,name=interval_duration_days,json=intervalDurationDays,proto3" json:"interval_duration_days,omitempty"`
 }
@@ -522,7 +522,7 @@ func (*ScanConfig_Schedule) Descriptor() ([]byte, []int) {
 	return file_google_cloud_websecurityscanner_v1_scan_config_proto_rawDescGZIP(), []int{0, 1}
 }
 
-func (x *ScanConfig_Schedule) GetScheduleTime() *timestamp.Timestamp {
+func (x *ScanConfig_Schedule) GetScheduleTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.ScheduleTime
 	}
@@ -978,7 +978,7 @@ var file_google_cloud_websecurityscanner_v1_scan_config_proto_goTypes = []interf
 	(*ScanConfig_Authentication_CustomAccount)(nil),                           // 7: google.cloud.websecurityscanner.v1.ScanConfig.Authentication.CustomAccount
 	(*ScanConfig_Authentication_IapCredential)(nil),                           // 8: google.cloud.websecurityscanner.v1.ScanConfig.Authentication.IapCredential
 	(*ScanConfig_Authentication_IapCredential_IapTestServiceAccountInfo)(nil), // 9: google.cloud.websecurityscanner.v1.ScanConfig.Authentication.IapCredential.IapTestServiceAccountInfo
-	(*timestamp.Timestamp)(nil),                                               // 10: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                                             // 10: google.protobuf.Timestamp
 }
 var file_google_cloud_websecurityscanner_v1_scan_config_proto_depIdxs = []int32{
 	4,  // 0: google.cloud.websecurityscanner.v1.ScanConfig.authentication:type_name -> google.cloud.websecurityscanner.v1.ScanConfig.Authentication
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/scan_config_error.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/scan_config_error.pb.go
index 3a5d9a8abfa..aaa0db1e538 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/scan_config_error.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/scan_config_error.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/scan_config_error.proto
 
 package websecurityscannerpb
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/scan_run.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/scan_run.pb.go
index f76ecf2be38..8c50e2002db 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/scan_run.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/scan_run.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/scan_run.proto
 
 package websecurityscannerpb
@@ -24,9 +24,9 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -169,10 +169,10 @@ type ScanRun struct {
 	// execution state reaches "FINISHED".
 	ResultState ScanRun_ResultState `protobuf:"varint,3,opt,name=result_state,json=resultState,proto3,enum=google.cloud.websecurityscanner.v1.ScanRun_ResultState" json:"result_state,omitempty"`
 	// Output only. The time at which the ScanRun started.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. The time at which the ScanRun reached termination state - that the ScanRun
 	// is either finished or stopped by user.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. The number of URLs crawled during this ScanRun. If the scan is in progress,
 	// the value represents the number of URLs crawled up to now.
 	UrlsCrawledCount int64 `protobuf:"varint,6,opt,name=urls_crawled_count,json=urlsCrawledCount,proto3" json:"urls_crawled_count,omitempty"`
@@ -248,14 +248,14 @@ func (x *ScanRun) GetResultState() ScanRun_ResultState {
 	return ScanRun_RESULT_STATE_UNSPECIFIED
 }
 
-func (x *ScanRun) GetStartTime() *timestamp.Timestamp {
+func (x *ScanRun) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *ScanRun) GetEndTime() *timestamp.Timestamp {
+func (x *ScanRun) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -411,12 +411,12 @@ func file_google_cloud_websecurityscanner_v1_scan_run_proto_rawDescGZIP() []byte
 var file_google_cloud_websecurityscanner_v1_scan_run_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
 var file_google_cloud_websecurityscanner_v1_scan_run_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_google_cloud_websecurityscanner_v1_scan_run_proto_goTypes = []interface{}{
-	(ScanRun_ExecutionState)(0), // 0: google.cloud.websecurityscanner.v1.ScanRun.ExecutionState
-	(ScanRun_ResultState)(0),    // 1: google.cloud.websecurityscanner.v1.ScanRun.ResultState
-	(*ScanRun)(nil),             // 2: google.cloud.websecurityscanner.v1.ScanRun
-	(*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp
-	(*ScanRunErrorTrace)(nil),   // 4: google.cloud.websecurityscanner.v1.ScanRunErrorTrace
-	(*ScanRunWarningTrace)(nil), // 5: google.cloud.websecurityscanner.v1.ScanRunWarningTrace
+	(ScanRun_ExecutionState)(0),   // 0: google.cloud.websecurityscanner.v1.ScanRun.ExecutionState
+	(ScanRun_ResultState)(0),      // 1: google.cloud.websecurityscanner.v1.ScanRun.ResultState
+	(*ScanRun)(nil),               // 2: google.cloud.websecurityscanner.v1.ScanRun
+	(*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp
+	(*ScanRunErrorTrace)(nil),     // 4: google.cloud.websecurityscanner.v1.ScanRunErrorTrace
+	(*ScanRunWarningTrace)(nil),   // 5: google.cloud.websecurityscanner.v1.ScanRunWarningTrace
 }
 var file_google_cloud_websecurityscanner_v1_scan_run_proto_depIdxs = []int32{
 	0, // 0: google.cloud.websecurityscanner.v1.ScanRun.execution_state:type_name -> google.cloud.websecurityscanner.v1.ScanRun.ExecutionState
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/scan_run_error_trace.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/scan_run_error_trace.pb.go
index c7811c074a1..90795dfa5fd 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/scan_run_error_trace.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/scan_run_error_trace.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/scan_run_error_trace.proto
 
 package websecurityscannerpb
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/scan_run_log.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/scan_run_log.pb.go
index a9f094d46f8..2e021c7898f 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/scan_run_log.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/scan_run_log.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/scan_run_log.proto
 
 package websecurityscannerpb
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/scan_run_warning_trace.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/scan_run_warning_trace.pb.go
index a978e5f6b93..de54ae75ed6 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/scan_run_warning_trace.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/scan_run_warning_trace.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/scan_run_warning_trace.proto
 
 package websecurityscannerpb
diff --git a/websecurityscanner/apiv1/websecurityscannerpb/web_security_scanner.pb.go b/websecurityscanner/apiv1/websecurityscannerpb/web_security_scanner.pb.go
index b7e5cb25e14..c6027d8154c 100644
--- a/websecurityscanner/apiv1/websecurityscannerpb/web_security_scanner.pb.go
+++ b/websecurityscanner/apiv1/websecurityscannerpb/web_security_scanner.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/websecurityscanner/v1/web_security_scanner.proto
 
 package websecurityscannerpb
@@ -25,14 +25,14 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	emptypb "google.golang.org/protobuf/types/known/emptypb"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
 )
 
 const (
@@ -286,7 +286,7 @@ type UpdateScanConfigRequest struct {
 	// Required. The update mask applies to the resource. For the `FieldMask` definition,
 	// see
 	// https://developers.google.com/protocol-buffers/docs/reference/google.protobuf#fieldmask
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateScanConfigRequest) Reset() {
@@ -328,7 +328,7 @@ func (x *UpdateScanConfigRequest) GetScanConfig() *ScanConfig {
 	return nil
 }
 
-func (x *UpdateScanConfigRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateScanConfigRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -1461,12 +1461,12 @@ var file_google_cloud_websecurityscanner_v1_web_security_scanner_proto_goTypes =
 	(*ListFindingTypeStatsRequest)(nil),  // 16: google.cloud.websecurityscanner.v1.ListFindingTypeStatsRequest
 	(*ListFindingTypeStatsResponse)(nil), // 17: google.cloud.websecurityscanner.v1.ListFindingTypeStatsResponse
 	(*ScanConfig)(nil),                   // 18: google.cloud.websecurityscanner.v1.ScanConfig
-	(*field_mask.FieldMask)(nil),         // 19: google.protobuf.FieldMask
+	(*fieldmaskpb.FieldMask)(nil),        // 19: google.protobuf.FieldMask
 	(*ScanRun)(nil),                      // 20: google.cloud.websecurityscanner.v1.ScanRun
 	(*CrawledUrl)(nil),                   // 21: google.cloud.websecurityscanner.v1.CrawledUrl
 	(*Finding)(nil),                      // 22: google.cloud.websecurityscanner.v1.Finding
 	(*FindingTypeStats)(nil),             // 23: google.cloud.websecurityscanner.v1.FindingTypeStats
-	(*empty.Empty)(nil),                  // 24: google.protobuf.Empty
+	(*emptypb.Empty)(nil),                // 24: google.protobuf.Empty
 }
 var file_google_cloud_websecurityscanner_v1_web_security_scanner_proto_depIdxs = []int32{
 	18, // 0: google.cloud.websecurityscanner.v1.CreateScanConfigRequest.scan_config:type_name -> google.cloud.websecurityscanner.v1.ScanConfig
@@ -1773,7 +1773,7 @@ type WebSecurityScannerClient interface {
 	// Creates a new ScanConfig.
 	CreateScanConfig(ctx context.Context, in *CreateScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
 	// Deletes an existing ScanConfig and its child resources.
-	DeleteScanConfig(ctx context.Context, in *DeleteScanConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error)
+	DeleteScanConfig(ctx context.Context, in *DeleteScanConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	// Gets a ScanConfig.
 	GetScanConfig(ctx context.Context, in *GetScanConfigRequest, opts ...grpc.CallOption) (*ScanConfig, error)
 	// Lists ScanConfigs under a given project.
@@ -1816,8 +1816,8 @@ func (c *webSecurityScannerClient) CreateScanConfig(ctx context.Context, in *Cre
 	return out, nil
 }
 
-func (c *webSecurityScannerClient) DeleteScanConfig(ctx context.Context, in *DeleteScanConfigRequest, opts ...grpc.CallOption) (*empty.Empty, error) {
-	out := new(empty.Empty)
+func (c *webSecurityScannerClient) DeleteScanConfig(ctx context.Context, in *DeleteScanConfigRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	out := new(emptypb.Empty)
 	err := c.cc.Invoke(ctx, "/google.cloud.websecurityscanner.v1.WebSecurityScanner/DeleteScanConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
@@ -1929,7 +1929,7 @@ type WebSecurityScannerServer interface {
 	// Creates a new ScanConfig.
 	CreateScanConfig(context.Context, *CreateScanConfigRequest) (*ScanConfig, error)
 	// Deletes an existing ScanConfig and its child resources.
-	DeleteScanConfig(context.Context, *DeleteScanConfigRequest) (*empty.Empty, error)
+	DeleteScanConfig(context.Context, *DeleteScanConfigRequest) (*emptypb.Empty, error)
 	// Gets a ScanConfig.
 	GetScanConfig(context.Context, *GetScanConfigRequest) (*ScanConfig, error)
 	// Lists ScanConfigs under a given project.
@@ -1962,7 +1962,7 @@ type UnimplementedWebSecurityScannerServer struct {
 func (*UnimplementedWebSecurityScannerServer) CreateScanConfig(context.Context, *CreateScanConfigRequest) (*ScanConfig, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateScanConfig not implemented")
 }
-func (*UnimplementedWebSecurityScannerServer) DeleteScanConfig(context.Context, *DeleteScanConfigRequest) (*empty.Empty, error) {
+func (*UnimplementedWebSecurityScannerServer) DeleteScanConfig(context.Context, *DeleteScanConfigRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeleteScanConfig not implemented")
 }
 func (*UnimplementedWebSecurityScannerServer) GetScanConfig(context.Context, *GetScanConfigRequest) (*ScanConfig, error) {
diff --git a/websecurityscanner/go.mod b/websecurityscanner/go.mod
index f34f8e2d047..7aa91302c45 100644
--- a/websecurityscanner/go.mod
+++ b/websecurityscanner/go.mod
@@ -3,10 +3,9 @@ module cloud.google.com/go/websecurityscanner
 go 1.19
 
 require (
-	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
 	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
@@ -14,12 +13,13 @@ require (
 require (
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
 	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/websecurityscanner/go.sum b/websecurityscanner/go.sum
index 94f2cd29758..b16568229fc 100644
--- a/websecurityscanner/go.sum
+++ b/websecurityscanner/go.sum
@@ -1,6 +1,8 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -60,8 +62,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
 golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -77,8 +79,8 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -94,8 +96,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/workflows/apiv1/doc.go b/workflows/apiv1/doc.go
index 7b15234d09e..ac083fd00f4 100644
--- a/workflows/apiv1/doc.go
+++ b/workflows/apiv1/doc.go
@@ -58,7 +58,7 @@
 //
 //	req := &workflowspb.ListWorkflowsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/v1#ListWorkflowsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/workflows/apiv1/workflowspb#ListWorkflowsRequest.
 //	}
 //	it := c.ListWorkflows(ctx, req)
 //	for {
diff --git a/workflows/apiv1/workflows_client.go b/workflows/apiv1/workflows_client.go
index a10e43111d8..3bbe87a606a 100644
--- a/workflows/apiv1/workflows_client.go
+++ b/workflows/apiv1/workflows_client.go
@@ -25,12 +25,12 @@ import (
 
 	"cloud.google.com/go/longrunning"
 	lroauto "cloud.google.com/go/longrunning/autogen"
+	workflowspb "cloud.google.com/go/workflows/apiv1/workflowspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	workflowspb "google.golang.org/genproto/googleapis/cloud/workflows/v1"
 	longrunningpb "google.golang.org/genproto/googleapis/longrunning"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/workflows/apiv1/workflows_client_example_test.go b/workflows/apiv1/workflows_client_example_test.go
index dacab5e241a..a597de98785 100644
--- a/workflows/apiv1/workflows_client_example_test.go
+++ b/workflows/apiv1/workflows_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	workflows "cloud.google.com/go/workflows/apiv1"
+	workflowspb "cloud.google.com/go/workflows/apiv1/workflowspb"
 	"google.golang.org/api/iterator"
-	workflowspb "google.golang.org/genproto/googleapis/cloud/workflows/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListWorkflows() {
 
 	req := &workflowspb.ListWorkflowsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/v1#ListWorkflowsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/apiv1/workflowspb#ListWorkflowsRequest.
 	}
 	it := c.ListWorkflows(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_GetWorkflow() {
 
 	req := &workflowspb.GetWorkflowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/v1#GetWorkflowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/apiv1/workflowspb#GetWorkflowRequest.
 	}
 	resp, err := c.GetWorkflow(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_CreateWorkflow() {
 
 	req := &workflowspb.CreateWorkflowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/v1#CreateWorkflowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/apiv1/workflowspb#CreateWorkflowRequest.
 	}
 	op, err := c.CreateWorkflow(ctx, req)
 	if err != nil {
@@ -142,7 +142,7 @@ func ExampleClient_DeleteWorkflow() {
 
 	req := &workflowspb.DeleteWorkflowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/v1#DeleteWorkflowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/apiv1/workflowspb#DeleteWorkflowRequest.
 	}
 	op, err := c.DeleteWorkflow(ctx, req)
 	if err != nil {
@@ -170,7 +170,7 @@ func ExampleClient_UpdateWorkflow() {
 
 	req := &workflowspb.UpdateWorkflowRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/v1#UpdateWorkflowRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/apiv1/workflowspb#UpdateWorkflowRequest.
 	}
 	op, err := c.UpdateWorkflow(ctx, req)
 	if err != nil {
diff --git a/workflows/apiv1/workflowspb/workflows.pb.go b/workflows/apiv1/workflowspb/workflows.pb.go
index ba0e4e356d0..cea85bb491b 100644
--- a/workflows/apiv1/workflowspb/workflows.pb.go
+++ b/workflows/apiv1/workflowspb/workflows.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/workflows/v1/workflows.proto
 
 package workflowspb
@@ -25,15 +25,15 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	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"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -119,12 +119,12 @@ type Workflow struct {
 	// 3 hexadecimal random characters.
 	RevisionId string `protobuf:"bytes,4,opt,name=revision_id,json=revisionId,proto3" json:"revision_id,omitempty"`
 	// Output only. The timestamp of when the workflow was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// Output only. The last update timestamp of the workflow.
-	UpdateTime *timestamp.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
+	UpdateTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=update_time,json=updateTime,proto3" json:"update_time,omitempty"`
 	// Output only. The timestamp that the latest revision of the workflow
 	// was created.
-	RevisionCreateTime *timestamp.Timestamp `protobuf:"bytes,7,opt,name=revision_create_time,json=revisionCreateTime,proto3" json:"revision_create_time,omitempty"`
+	RevisionCreateTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=revision_create_time,json=revisionCreateTime,proto3" json:"revision_create_time,omitempty"`
 	// Labels associated with this workflow.
 	// Labels can contain at most 64 entries. Keys and values can be no longer
 	// than 63 characters and can only contain lowercase letters, numeric
@@ -214,21 +214,21 @@ func (x *Workflow) GetRevisionId() string {
 	return ""
 }
 
-func (x *Workflow) GetCreateTime() *timestamp.Timestamp {
+func (x *Workflow) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *Workflow) GetUpdateTime() *timestamp.Timestamp {
+func (x *Workflow) GetUpdateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.UpdateTime
 	}
 	return nil
 }
 
-func (x *Workflow) GetRevisionCreateTime() *timestamp.Timestamp {
+func (x *Workflow) GetRevisionCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.RevisionCreateTime
 	}
@@ -634,7 +634,7 @@ type UpdateWorkflowRequest struct {
 	Workflow *Workflow `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"`
 	// List of fields to be updated. If not present, the entire workflow
 	// will be updated.
-	UpdateMask *field_mask.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
+	UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"`
 }
 
 func (x *UpdateWorkflowRequest) Reset() {
@@ -676,7 +676,7 @@ func (x *UpdateWorkflowRequest) GetWorkflow() *Workflow {
 	return nil
 }
 
-func (x *UpdateWorkflowRequest) GetUpdateMask() *field_mask.FieldMask {
+func (x *UpdateWorkflowRequest) GetUpdateMask() *fieldmaskpb.FieldMask {
 	if x != nil {
 		return x.UpdateMask
 	}
@@ -690,9 +690,9 @@ type OperationMetadata struct {
 	unknownFields protoimpl.UnknownFields
 
 	// The time the operation was created.
-	CreateTime *timestamp.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
+	CreateTime *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"`
 	// The time the operation finished running.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Server-defined resource path for the target of the operation.
 	Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty"`
 	// Name of the verb executed by the operation.
@@ -733,14 +733,14 @@ func (*OperationMetadata) Descriptor() ([]byte, []int) {
 	return file_google_cloud_workflows_v1_workflows_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *OperationMetadata) GetCreateTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetCreateTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.CreateTime
 	}
 	return nil
 }
 
-func (x *OperationMetadata) GetEndTime() *timestamp.Timestamp {
+func (x *OperationMetadata) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1011,8 +1011,8 @@ var file_google_cloud_workflows_v1_workflows_proto_goTypes = []interface{}{
 	(*UpdateWorkflowRequest)(nil), // 7: google.cloud.workflows.v1.UpdateWorkflowRequest
 	(*OperationMetadata)(nil),     // 8: google.cloud.workflows.v1.OperationMetadata
 	nil,                           // 9: google.cloud.workflows.v1.Workflow.LabelsEntry
-	(*timestamp.Timestamp)(nil),   // 10: google.protobuf.Timestamp
-	(*field_mask.FieldMask)(nil),  // 11: google.protobuf.FieldMask
+	(*timestamppb.Timestamp)(nil), // 10: google.protobuf.Timestamp
+	(*fieldmaskpb.FieldMask)(nil), // 11: google.protobuf.FieldMask
 	(*longrunning.Operation)(nil), // 12: google.longrunning.Operation
 }
 var file_google_cloud_workflows_v1_workflows_proto_depIdxs = []int32{
diff --git a/workflows/executions/apiv1/doc.go b/workflows/executions/apiv1/doc.go
index a4757dd861d..3f915c90529 100644
--- a/workflows/executions/apiv1/doc.go
+++ b/workflows/executions/apiv1/doc.go
@@ -57,7 +57,7 @@
 //
 //	req := &executionspb.ListExecutionsRequest{
 //		// TODO: Fill request struct fields.
-//		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/executions/v1#ListExecutionsRequest.
+//		// See https://pkg.go.dev/cloud.google.com/go/workflows/executions/apiv1/executionspb#ListExecutionsRequest.
 //	}
 //	it := c.ListExecutions(ctx, req)
 //	for {
diff --git a/workflows/executions/apiv1/executions_client.go b/workflows/executions/apiv1/executions_client.go
index 87ef28873c9..9c78f060ecd 100644
--- a/workflows/executions/apiv1/executions_client.go
+++ b/workflows/executions/apiv1/executions_client.go
@@ -22,12 +22,12 @@ import (
 	"math"
 	"net/url"
 
+	executionspb "cloud.google.com/go/workflows/executions/apiv1/executionspb"
 	gax "github.com/googleapis/gax-go/v2"
 	"google.golang.org/api/iterator"
 	"google.golang.org/api/option"
 	"google.golang.org/api/option/internaloption"
 	gtransport "google.golang.org/api/transport/grpc"
-	executionspb "google.golang.org/genproto/googleapis/cloud/workflows/executions/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/workflows/executions/apiv1/executions_client_example_test.go b/workflows/executions/apiv1/executions_client_example_test.go
index f7e6cd79585..7aecb45141f 100644
--- a/workflows/executions/apiv1/executions_client_example_test.go
+++ b/workflows/executions/apiv1/executions_client_example_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 
 	executions "cloud.google.com/go/workflows/executions/apiv1"
+	executionspb "cloud.google.com/go/workflows/executions/apiv1/executionspb"
 	"google.golang.org/api/iterator"
-	executionspb "google.golang.org/genproto/googleapis/cloud/workflows/executions/v1"
 )
 
 func ExampleNewClient() {
@@ -56,7 +56,7 @@ func ExampleClient_ListExecutions() {
 
 	req := &executionspb.ListExecutionsRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/executions/v1#ListExecutionsRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/executions/apiv1/executionspb#ListExecutionsRequest.
 	}
 	it := c.ListExecutions(ctx, req)
 	for {
@@ -87,7 +87,7 @@ func ExampleClient_CreateExecution() {
 
 	req := &executionspb.CreateExecutionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/executions/v1#CreateExecutionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/executions/apiv1/executionspb#CreateExecutionRequest.
 	}
 	resp, err := c.CreateExecution(ctx, req)
 	if err != nil {
@@ -112,7 +112,7 @@ func ExampleClient_GetExecution() {
 
 	req := &executionspb.GetExecutionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/executions/v1#GetExecutionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/executions/apiv1/executionspb#GetExecutionRequest.
 	}
 	resp, err := c.GetExecution(ctx, req)
 	if err != nil {
@@ -137,7 +137,7 @@ func ExampleClient_CancelExecution() {
 
 	req := &executionspb.CancelExecutionRequest{
 		// TODO: Fill request struct fields.
-		// See https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/workflows/executions/v1#CancelExecutionRequest.
+		// See https://pkg.go.dev/cloud.google.com/go/workflows/executions/apiv1/executionspb#CancelExecutionRequest.
 	}
 	resp, err := c.CancelExecution(ctx, req)
 	if err != nil {
diff --git a/workflows/executions/apiv1/executionspb/executions.pb.go b/workflows/executions/apiv1/executionspb/executions.pb.go
index 68fe45d5312..70d65cba3dc 100644
--- a/workflows/executions/apiv1/executionspb/executions.pb.go
+++ b/workflows/executions/apiv1/executionspb/executions.pb.go
@@ -15,7 +15,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.12.2
+// 	protoc        v3.21.5
 // source: google/cloud/workflows/executions/v1/executions.proto
 
 package executionspb
@@ -25,13 +25,13 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 const (
@@ -225,9 +225,9 @@ type Execution struct {
 	// projects/{project}/locations/{location}/workflows/{workflow}/executions/{execution}
 	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	// Output only. Marks the beginning of execution.
-	StartTime *timestamp.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
+	StartTime *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"`
 	// Output only. Marks the end of execution, successful or not.
-	EndTime *timestamp.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
+	EndTime *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"`
 	// Output only. Current state of the execution.
 	State Execution_State `protobuf:"varint,4,opt,name=state,proto3,enum=google.cloud.workflows.executions.v1.Execution_State" json:"state,omitempty"`
 	// Input parameters of the execution represented as a JSON string.
@@ -289,14 +289,14 @@ func (x *Execution) GetName() string {
 	return ""
 }
 
-func (x *Execution) GetStartTime() *timestamp.Timestamp {
+func (x *Execution) GetStartTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.StartTime
 	}
 	return nil
 }
 
-func (x *Execution) GetEndTime() *timestamp.Timestamp {
+func (x *Execution) GetEndTime() *timestamppb.Timestamp {
 	if x != nil {
 		return x.EndTime
 	}
@@ -1191,7 +1191,7 @@ var file_google_cloud_workflows_executions_v1_executions_proto_goTypes = []inter
 	(*Execution_StackTrace)(nil),                 // 10: google.cloud.workflows.executions.v1.Execution.StackTrace
 	(*Execution_Error)(nil),                      // 11: google.cloud.workflows.executions.v1.Execution.Error
 	(*Execution_StackTraceElement_Position)(nil), // 12: google.cloud.workflows.executions.v1.Execution.StackTraceElement.Position
-	(*timestamp.Timestamp)(nil),                  // 13: google.protobuf.Timestamp
+	(*timestamppb.Timestamp)(nil),                // 13: google.protobuf.Timestamp
 }
 var file_google_cloud_workflows_executions_v1_executions_proto_depIdxs = []int32{
 	13, // 0: google.cloud.workflows.executions.v1.Execution.start_time:type_name -> google.protobuf.Timestamp
diff --git a/workflows/go.mod b/workflows/go.mod
index 98b436c6394..61ae418f096 100644
--- a/workflows/go.mod
+++ b/workflows/go.mod
@@ -3,24 +3,25 @@ module cloud.google.com/go/workflows
 go 1.19
 
 require (
-	cloud.google.com/go v0.104.0
+	cloud.google.com/go/longrunning v0.1.1
 	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go/v2 v2.6.0
-	google.golang.org/api v0.99.0
-	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e
+	google.golang.org/api v0.100.0
+	google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
+	cloud.google.com/go v0.105.0 // indirect
 	cloud.google.com/go/compute v1.10.0 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
-	golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 // indirect
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
+	golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 )
diff --git a/workflows/go.sum b/workflows/go.sum
index 8784b2a0c77..197b62f3d3c 100644
--- a/workflows/go.sum
+++ b/workflows/go.sum
@@ -1,8 +1,10 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
-cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y=
+cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
 cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/longrunning v0.1.1 h1:y50CXG4j0+qvEukslYFBCrzaXX0qpFbBzc3PchSu/LE=
+cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
@@ -62,11 +64,11 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 h1:MgJ6t2zo8v0tbmLCueaCbF1RM+TtB0rs3Lv8DGtOIpY=
-golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1 h1:3VPzK7eqH25j7GYw5w6g/GzNRc0/fYtrxz27z1gD4W0=
-golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
 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-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -79,16 +81,16 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.99.0 h1:tsBtOIklCE2OFxhmcYSVqGwSAN/Y897srxmcvAQnwK8=
-google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08=
+google.golang.org/api v0.100.0 h1:LGUYIrbW9pzYQQ8NWXlaIVkgnfubVBZbMFb9P8TK374=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -96,8 +98,8 @@ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e h1:halCgTFuLWDRD61piiNSxPsARANGD3Xl16hPrLgLiIg=
-google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c h1:QgY/XxIAIeccR+Ca/rDdKubLIU9rcJ3xfy1DC/Wd2Oo=
+google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=