diff --git a/google/cloud/metastore/logging/v1/BUILD.bazel b/google/cloud/metastore/logging/v1/BUILD.bazel
index d34fb38e2..5df0900eb 100644
--- a/google/cloud/metastore/logging/v1/BUILD.bazel
+++ b/google/cloud/metastore/logging/v1/BUILD.bazel
@@ -82,11 +82,12 @@ py_grpc_library(
 
 ##############################################################################
 # PHP
+# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "php_grpc_library",
-    "php_proto_library",
+    php_grpc_library = "php_grpc_library2",
+    php_proto_library = "php_proto_library2",
 )
 
 php_proto_library(
diff --git a/google/cloud/metastore/v1alpha/BUILD.bazel b/google/cloud/metastore/v1alpha/BUILD.bazel
index c46b8b009..a74c86e7d 100644
--- a/google/cloud/metastore/v1alpha/BUILD.bazel
+++ b/google/cloud/metastore/v1alpha/BUILD.bazel
@@ -179,13 +179,14 @@ py_gapic_assembly_pkg(
 
 ##############################################################################
 # PHP
+# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "php_gapic_assembly_pkg",
-    "php_gapic_library",
-    "php_grpc_library",
-    "php_proto_library",
+    php_gapic_assembly_pkg = "php_gapic_assembly_pkg2",
+    php_gapic_library = "php_gapic_library2",
+    php_grpc_library = "php_grpc_library2",
+    php_proto_library = "php_proto_library2",
 )
 
 php_proto_library(
@@ -201,10 +202,8 @@ php_grpc_library(
 
 php_gapic_library(
     name = "metastore_php_gapic",
-    src = ":metastore_proto_with_info",
-    gapic_yaml = "metastore_gapic.yaml",
+    srcs = [":metastore_proto_with_info"],
     grpc_service_config = "metastore_grpc_service_config.json",
-    package = "google.cloud.metastore.v1alpha",
     service_yaml = "metastore_v1alpha.yaml",
     deps = [
         ":metastore_php_grpc",
diff --git a/google/cloud/metastore/v1beta/BUILD.bazel b/google/cloud/metastore/v1beta/BUILD.bazel
index 42a4152a3..dc2dfc488 100644
--- a/google/cloud/metastore/v1beta/BUILD.bazel
+++ b/google/cloud/metastore/v1beta/BUILD.bazel
@@ -126,13 +126,13 @@ go_gapic_library(
     srcs = [":metastore_proto_with_info"],
     grpc_service_config = "metastore_grpc_service_config.json",
     importpath = "cloud.google.com/go/metastore/apiv1beta;metastore",
-    service_yaml = "metastore_v1beta.yaml",
     metadata = True,
+    service_yaml = "metastore_v1beta.yaml",
     deps = [
         ":metastore_go_proto",
         "//google/longrunning:longrunning_go_proto",
-        "@com_google_cloud_go//longrunning/autogen:go_default_library",
         "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
     ],
 )
 
@@ -148,8 +148,8 @@ go_gapic_assembly_pkg(
     name = "gapi-cloud-metastore-v1beta-go",
     deps = [
         ":metastore_go_gapic",
-        ":metastore_go_gapic_srcjar-test.srcjar",
         ":metastore_go_gapic_srcjar-metadata.srcjar",
+        ":metastore_go_gapic_srcjar-test.srcjar",
         ":metastore_go_proto",
     ],
 )
@@ -180,13 +180,14 @@ py_gapic_assembly_pkg(
 
 ##############################################################################
 # PHP
+# DO NOT OVERRIDE this PHP microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "php_gapic_assembly_pkg",
-    "php_gapic_library",
-    "php_grpc_library",
-    "php_proto_library",
+    php_gapic_assembly_pkg = "php_gapic_assembly_pkg2",
+    php_gapic_library = "php_gapic_library2",
+    php_grpc_library = "php_grpc_library2",
+    php_proto_library = "php_proto_library2",
 )
 
 php_proto_library(
@@ -202,10 +203,8 @@ php_grpc_library(
 
 php_gapic_library(
     name = "metastore_php_gapic",
-    src = ":metastore_proto_with_info",
-    gapic_yaml = "metastore_gapis.yaml",
+    srcs = [":metastore_proto_with_info"],
     grpc_service_config = "metastore_grpc_service_config.json",
-    package = "google.cloud.metastore.v1beta",
     service_yaml = "metastore_v1beta.yaml",
     deps = [
         ":metastore_php_grpc",
@@ -256,8 +255,8 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
     "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
     "ruby_grpc_library",
     "ruby_proto_library",
 )
diff --git a/google/cloud/metastore/v1beta/metastore.proto b/google/cloud/metastore/v1beta/metastore.proto
index 4d4a68c4c..350c6bbf3 100644
--- a/google/cloud/metastore/v1beta/metastore.proto
+++ b/google/cloud/metastore/v1beta/metastore.proto
@@ -27,6 +27,7 @@ import "google/protobuf/wrappers.proto";
 import "google/type/dayofweek.proto";
 
 option go_package = "google.golang.org/genproto/googleapis/cloud/metastore/v1beta;metastore";
+option php_namespace = "Google\\Cloud\\Metastore\\V1beta";
 option java_multiple_files = true;
 option java_outer_classname = "MetastoreProto";
 option java_package = "com.google.cloud.metastore.v1beta";
@@ -54,7 +55,8 @@ option (google.api.resource_definition) = {
 //   `/projects/{project_number}/locations/{location_id}/services/{service_id}`.
 service DataprocMetastore {
   option (google.api.default_host) = "metastore.googleapis.com";
-  option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/cloud-platform";
+  option (google.api.oauth_scopes) =
+      "https://www.googleapis.com/auth/cloud-platform";
 
   // Lists services in a project and location.
   rpc ListServices(ListServicesRequest) returns (ListServicesResponse) {
@@ -73,7 +75,8 @@ service DataprocMetastore {
   }
 
   // Creates a metastore service in a project and location.
-  rpc CreateService(CreateServiceRequest) returns (google.longrunning.Operation) {
+  rpc CreateService(CreateServiceRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1beta/{parent=projects/*/locations/*}/services"
       body: "service"
@@ -86,7 +89,8 @@ service DataprocMetastore {
   }
 
   // Updates the parameters of a single service.
-  rpc UpdateService(UpdateServiceRequest) returns (google.longrunning.Operation) {
+  rpc UpdateService(UpdateServiceRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       patch: "/v1beta/{service.name=projects/*/locations/*/services/*}"
       body: "service"
@@ -99,7 +103,8 @@ service DataprocMetastore {
   }
 
   // Deletes a single service.
-  rpc DeleteService(DeleteServiceRequest) returns (google.longrunning.Operation) {
+  rpc DeleteService(DeleteServiceRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       delete: "/v1beta/{name=projects/*/locations/*/services/*}"
     };
@@ -111,7 +116,8 @@ service DataprocMetastore {
   }
 
   // Lists imports in a service.
-  rpc ListMetadataImports(ListMetadataImportsRequest) returns (ListMetadataImportsResponse) {
+  rpc ListMetadataImports(ListMetadataImportsRequest)
+      returns (ListMetadataImportsResponse) {
     option (google.api.http) = {
       get: "/v1beta/{parent=projects/*/locations/*/services/*}/metadataImports"
     };
@@ -127,12 +133,14 @@ service DataprocMetastore {
   }
 
   // Creates a new MetadataImport in a given project and location.
-  rpc CreateMetadataImport(CreateMetadataImportRequest) returns (google.longrunning.Operation) {
+  rpc CreateMetadataImport(CreateMetadataImportRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1beta/{parent=projects/*/locations/*/services/*}/metadataImports"
       body: "metadata_import"
     };
-    option (google.api.method_signature) = "parent,metadata_import,metadata_import_id";
+    option (google.api.method_signature) =
+        "parent,metadata_import,metadata_import_id";
     option (google.longrunning.operation_info) = {
       response_type: "MetadataImport"
       metadata_type: "OperationMetadata"
@@ -141,7 +149,8 @@ service DataprocMetastore {
 
   // Updates a single import.
   // Only the description field of MetadataImport is supported to be updated.
-  rpc UpdateMetadataImport(UpdateMetadataImportRequest) returns (google.longrunning.Operation) {
+  rpc UpdateMetadataImport(UpdateMetadataImportRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       patch: "/v1beta/{metadata_import.name=projects/*/locations/*/services/*/metadataImports/*}"
       body: "metadata_import"
@@ -154,7 +163,8 @@ service DataprocMetastore {
   }
 
   // Exports metadata from a service.
-  rpc ExportMetadata(ExportMetadataRequest) returns (google.longrunning.Operation) {
+  rpc ExportMetadata(ExportMetadataRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1beta/{service=projects/*/locations/*/services/*}:exportMetadata"
       body: "*"
@@ -166,7 +176,8 @@ service DataprocMetastore {
   }
 
   // Restores a service from a backup.
-  rpc RestoreService(RestoreServiceRequest) returns (google.longrunning.Operation) {
+  rpc RestoreService(RestoreServiceRequest)
+      returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v1beta/{service=projects/*/locations/*/services/*}:restore"
       body: "*"
@@ -296,29 +307,30 @@ message Service {
     HiveMetastoreConfig hive_metastore_config = 5;
   }
 
-  // Immutable. The relative resource name of the metastore service, of the form:
+  // Immutable. The relative resource name of the metastore service, of the
+  // form:
   //
   // `projects/{project_number}/locations/{location_id}/services/{service_id}`.
   string name = 1 [(google.api.field_behavior) = IMMUTABLE];
 
   // Output only. The time when the metastore service was created.
-  google.protobuf.Timestamp create_time = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 2
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time when the metastore service was last updated.
-  google.protobuf.Timestamp update_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp update_time = 3
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // User-defined labels for the metastore service.
   map<string, string> labels = 4;
 
-  // Immutable. The relative resource name of the VPC network on which the instance can be
-  // accessed. It is specified in the following form:
+  // Immutable. The relative resource name of the VPC network on which the
+  // instance can be accessed. It is specified in the following form:
   //
   // `projects/{project_number}/global/networks/{network_id}`.
   string network = 7 [
     (google.api.field_behavior) = IMMUTABLE,
-    (google.api.resource_reference) = {
-      type: "compute.googleapis.com/Network"
-    }
+    (google.api.resource_reference) = { type: "compute.googleapis.com/Network" }
   ];
 
   // Output only. The URI of the endpoint used to access the metastore service.
@@ -330,12 +342,12 @@ message Service {
   // Output only. The current state of the metastore service.
   State state = 10 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. Additional information about the current state of the metastore service, if
-  // available.
+  // Output only. Additional information about the current state of the
+  // metastore service, if available.
   string state_message = 11 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. A Cloud Storage URI (starting with `gs://`) that specifies where artifacts
-  // related to the metastore service are stored.
+  // Output only. A Cloud Storage URI (starting with `gs://`) that specifies
+  // where artifacts related to the metastore service are stored.
   string artifact_gcs_uri = 12 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // The tier of the service.
@@ -349,11 +361,13 @@ message Service {
   // when the service can be restarted for maintenance purposes in UTC time.
   MaintenanceWindow maintenance_window = 15;
 
-  // Output only. The globally unique resource identifier of the metastore service.
+  // Output only. The globally unique resource identifier of the metastore
+  // service.
   string uid = 16 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The metadata management activities of the metastore service.
-  MetadataManagementActivity metadata_management_activity = 17 [(google.api.field_behavior) = OUTPUT_ONLY];
+  MetadataManagementActivity metadata_management_activity = 17
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Immutable. The release channel of the service.
   // If unspecified, defaults to `STABLE`.
@@ -434,7 +448,8 @@ message Secret {
 // The metadata management activities of the metastore service.
 message MetadataManagementActivity {
   // Output only. The latest metadata exports of the metastore service.
-  repeated MetadataExport metadata_exports = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
+  repeated MetadataExport metadata_exports = 1
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The latest restores of the metastore service.
   repeated Restore restores = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
@@ -469,7 +484,8 @@ message MetadataImport {
     // The name of the source database.
     string source_database = 3 [deprecated = true];
 
-    // Optional. The type of the database dump. If unspecified, defaults to `MYSQL`.
+    // Optional. The type of the database dump. If unspecified, defaults to
+    // `MYSQL`.
     DatabaseDumpSpec.Type type = 4 [(google.api.field_behavior) = OPTIONAL];
   }
 
@@ -507,10 +523,12 @@ message MetadataImport {
   string description = 2;
 
   // Output only. The time when the metadata import was created.
-  google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 3
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time when the metadata import was last updated.
-  google.protobuf.Timestamp update_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp update_time = 4
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The current state of the metadata import.
   State state = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
@@ -537,23 +555,27 @@ message MetadataExport {
   }
 
   oneof destination {
-    // Output only. A Cloud Storage URI of a folder that metadata are exported to, in the
-    // form of `gs://<bucket_name>/<path_inside_bucket>/<export_folder>`, where
+    // Output only. A Cloud Storage URI of a folder that metadata are exported
+    // to, in the form of
+    // `gs://<bucket_name>/<path_inside_bucket>/<export_folder>`, where
     // `<export_folder>` is automatically generated.
     string destination_gcs_uri = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
   }
 
   // Output only. The time when the export started.
-  google.protobuf.Timestamp start_time = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp start_time = 1
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time when the export ended.
-  google.protobuf.Timestamp end_time = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp end_time = 2
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The current state of the export.
   State state = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The type of the database dump.
-  DatabaseDumpSpec.Type database_dump_type = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
+  DatabaseDumpSpec.Type database_dump_type = 5
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
 // The details of a backup resource.
@@ -587,10 +609,12 @@ message Backup {
   string name = 1 [(google.api.field_behavior) = IMMUTABLE];
 
   // Output only. The time when the backup was started.
-  google.protobuf.Timestamp create_time = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 2
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time when the backup finished creating.
-  google.protobuf.Timestamp end_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp end_time = 3
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The current state of the backup.
   State state = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
@@ -635,16 +659,18 @@ message Restore {
   }
 
   // Output only. The time when the restore started.
-  google.protobuf.Timestamp start_time = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp start_time = 1
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time when the restore ended.
-  google.protobuf.Timestamp end_time = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp end_time = 2
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The current state of the restore.
   State state = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. The relative resource name of the metastore service backup to restore
-  // from, in the following form:
+  // Output only. The relative resource name of the metastore service backup to
+  // restore from, in the following form:
   //
   // `projects/{project_id}/locations/{location_id}/services/{service_id}/backups/{backup_id}`
   string backup = 4 [
@@ -657,15 +683,16 @@ message Restore {
   // Output only. The type of restore.
   RestoreType type = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
 
-  // Output only. The restore details containing the revision of the service to be restored
-  // to, in format of JSON.
+  // Output only. The restore details containing the revision of the service to
+  // be restored to, in format of JSON.
   string details = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
-// Request message for [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices].
+// Request message for
+// [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices].
 message ListServicesRequest {
-  // Required. The relative resource name of the location of metastore services to
-  // list, in the following form:
+  // Required. The relative resource name of the location of metastore services
+  // to list, in the following form:
   //
   // `projects/{project_number}/locations/{location_id}`.
   string parent = 1 [
@@ -675,19 +702,21 @@ message ListServicesRequest {
     }
   ];
 
-  // Optional. The maximum number of services to return. The response may contain less
-  // than the maximum number. If unspecified, no more than 500 services are
-  // returned. The maximum value is 1000; values above 1000 are changed to 1000.
+  // Optional. The maximum number of services to return. The response may
+  // contain less than the maximum number. If unspecified, no more than 500
+  // services are returned. The maximum value is 1000; values above 1000 are
+  // changed to 1000.
   int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. A page token, received from a previous [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices]
+  // Optional. A page token, received from a previous
+  // [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices]
   // call. Provide this token to retrieve the subsequent page.
   //
   // To retrieve the first page, supply an empty page token.
   //
   // When paginating, other parameters provided to
-  // [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices] must match the call that provided the
-  // page token.
+  // [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices]
+  // must match the call that provided the page token.
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The filter to apply to list results.
@@ -699,7 +728,8 @@ message ListServicesRequest {
   string order_by = 5 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Response message for [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices].
+// Response message for
+// [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices].
 message ListServicesResponse {
   // The services in the specified location.
   repeated Service services = 1;
@@ -712,10 +742,11 @@ message ListServicesResponse {
   repeated string unreachable = 3;
 }
 
-// Request message for [DataprocMetastore.GetService][google.cloud.metastore.v1beta.DataprocMetastore.GetService].
+// Request message for
+// [DataprocMetastore.GetService][google.cloud.metastore.v1beta.DataprocMetastore.GetService].
 message GetServiceRequest {
-  // Required. The relative resource name of the metastore service to retrieve, in the
-  // following form:
+  // Required. The relative resource name of the metastore service to retrieve,
+  // in the following form:
   //
   // `projects/{project_number}/locations/{location_id}/services/{service_id}`.
   string name = 1 [
@@ -726,10 +757,11 @@ message GetServiceRequest {
   ];
 }
 
-// Request message for [DataprocMetastore.CreateService][google.cloud.metastore.v1beta.DataprocMetastore.CreateService].
+// Request message for
+// [DataprocMetastore.CreateService][google.cloud.metastore.v1beta.DataprocMetastore.CreateService].
 message CreateServiceRequest {
-  // Required. The relative resource name of the location in which to create a metastore
-  // service, in the following form:
+  // Required. The relative resource name of the location in which to create a
+  // metastore service, in the following form:
   //
   // `projects/{project_number}/locations/{location_id}`.
   string parent = 1 [
@@ -752,10 +784,10 @@ message CreateServiceRequest {
   // the request's `service_id` field.
   Service service = 3 [(google.api.field_behavior) = REQUIRED];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -767,13 +799,15 @@ message CreateServiceRequest {
   string request_id = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [DataprocMetastore.UpdateService][google.cloud.metastore.v1beta.DataprocMetastore.UpdateService].
+// Request message for
+// [DataprocMetastore.UpdateService][google.cloud.metastore.v1beta.DataprocMetastore.UpdateService].
 message UpdateServiceRequest {
   // Required. A field mask used to specify the fields to be overwritten in the
   // 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.
-  google.protobuf.FieldMask update_mask = 1 [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 1
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The metastore service to update. The server only merges fields
   // in the service if they are specified in `update_mask`.
@@ -782,10 +816,10 @@ message UpdateServiceRequest {
   // service to be updated.
   Service service = 2 [(google.api.field_behavior) = REQUIRED];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -797,10 +831,11 @@ message UpdateServiceRequest {
   string request_id = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [DataprocMetastore.DeleteService][google.cloud.metastore.v1beta.DataprocMetastore.DeleteService].
+// Request message for
+// [DataprocMetastore.DeleteService][google.cloud.metastore.v1beta.DataprocMetastore.DeleteService].
 message DeleteServiceRequest {
-  // Required. The relative resource name of the metastore service to delete, in the
-  // following form:
+  // Required. The relative resource name of the metastore service to delete, in
+  // the following form:
   //
   // `projects/{project_number}/locations/{location_id}/services/{service_id}`.
   string name = 1 [
@@ -810,10 +845,10 @@ message DeleteServiceRequest {
     }
   ];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -825,10 +860,11 @@ message DeleteServiceRequest {
   string request_id = 2 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [DataprocMetastore.ListMetadataImports][google.cloud.metastore.v1beta.DataprocMetastore.ListMetadataImports].
+// Request message for
+// [DataprocMetastore.ListMetadataImports][google.cloud.metastore.v1beta.DataprocMetastore.ListMetadataImports].
 message ListMetadataImportsRequest {
-  // Required. The relative resource name of the service whose metadata imports to
-  // list, in the following form:
+  // Required. The relative resource name of the service whose metadata imports
+  // to list, in the following form:
   //
   // `projects/{project_number}/locations/{location_id}/services/{service_id}/metadataImports`.
   string parent = 1 [
@@ -838,19 +874,20 @@ message ListMetadataImportsRequest {
     }
   ];
 
-  // Optional. The maximum number of imports to return. The response may contain less
-  // than the maximum number. If unspecified, no more than 500 imports are
+  // Optional. The maximum number of imports to return. The response may contain
+  // less than the maximum number. If unspecified, no more than 500 imports are
   // returned. The maximum value is 1000; values above 1000 are changed to 1000.
   int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. A page token, received from a previous [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices]
+  // Optional. A page token, received from a previous
+  // [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices]
   // call. Provide this token to retrieve the subsequent page.
   //
   // To retrieve the first page, supply an empty page token.
   //
   // When paginating, other parameters provided to
-  // [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices] must match the call that provided the
-  // page token.
+  // [DataprocMetastore.ListServices][google.cloud.metastore.v1beta.DataprocMetastore.ListServices]
+  // must match the call that provided the page token.
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The filter to apply to list results.
@@ -862,7 +899,8 @@ message ListMetadataImportsRequest {
   string order_by = 5 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Response message for [DataprocMetastore.ListMetadataImports][google.cloud.metastore.v1beta.DataprocMetastore.ListMetadataImports].
+// Response message for
+// [DataprocMetastore.ListMetadataImports][google.cloud.metastore.v1beta.DataprocMetastore.ListMetadataImports].
 message ListMetadataImportsResponse {
   // The imports in the specified service.
   repeated MetadataImport metadata_imports = 1;
@@ -875,10 +913,11 @@ message ListMetadataImportsResponse {
   repeated string unreachable = 3;
 }
 
-// Request message for [DataprocMetastore.GetMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.GetMetadataImport].
+// Request message for
+// [DataprocMetastore.GetMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.GetMetadataImport].
 message GetMetadataImportRequest {
-  // Required. The relative resource name of the metadata import to retrieve, in the
-  // following form:
+  // Required. The relative resource name of the metadata import to retrieve, in
+  // the following form:
   //
   // `projects/{project_number}/locations/{location_id}/services/{service_id}/metadataImports/{import_id}`.
   string name = 1 [
@@ -889,10 +928,11 @@ message GetMetadataImportRequest {
   ];
 }
 
-// Request message for [DataprocMetastore.CreateMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.CreateMetadataImport].
+// Request message for
+// [DataprocMetastore.CreateMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.CreateMetadataImport].
 message CreateMetadataImportRequest {
-  // Required. The relative resource name of the service in which to create a metastore
-  // import, in the following form:
+  // Required. The relative resource name of the service in which to create a
+  // metastore import, in the following form:
   //
   // `projects/{project_number}/locations/{location_id}/services/{service_id}`
   string parent = 1 [
@@ -902,23 +942,23 @@ message CreateMetadataImportRequest {
     }
   ];
 
-  // Required. The ID of the metadata import, which is used as the final component of the
-  // metadata import's name.
+  // Required. The ID of the metadata import, which is used as the final
+  // component of the metadata import's name.
   //
   // This value must be between 1 and 64 characters long, begin with a letter,
   // end with a letter or number, and consist of alpha-numeric ASCII characters
   // or hyphens.
   string metadata_import_id = 2 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. The metadata import to create. The `name` field is ignored. The ID of the
-  // created metadata import must be provided in the request's
+  // Required. The metadata import to create. The `name` field is ignored. The
+  // ID of the created metadata import must be provided in the request's
   // `metadata_import_id` field.
   MetadataImport metadata_import = 3 [(google.api.field_behavior) = REQUIRED];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -930,13 +970,15 @@ message CreateMetadataImportRequest {
   string request_id = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [DataprocMetastore.UpdateMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.UpdateMetadataImport].
+// Request message for
+// [DataprocMetastore.UpdateMetadataImport][google.cloud.metastore.v1beta.DataprocMetastore.UpdateMetadataImport].
 message UpdateMetadataImportRequest {
   // Required. A field mask used to specify the fields to be overwritten in the
   // 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.
-  google.protobuf.FieldMask update_mask = 1 [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 1
+      [(google.api.field_behavior) = REQUIRED];
 
   // Required. The metadata import to update. The server only merges fields
   // in the import if they are specified in `update_mask`.
@@ -945,10 +987,10 @@ message UpdateMetadataImportRequest {
   // import to be updated.
   MetadataImport metadata_import = 2 [(google.api.field_behavior) = REQUIRED];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -960,7 +1002,8 @@ message UpdateMetadataImportRequest {
   string request_id = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups].
+// Request message for
+// [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups].
 message ListBackupsRequest {
   // Required. The relative resource name of the service whose backups to
   // list, in the following form:
@@ -973,19 +1016,20 @@ message ListBackupsRequest {
     }
   ];
 
-  // Optional. The maximum number of backups to return. The response may contain less
-  // than the maximum number. If unspecified, no more than 500 backups are
+  // Optional. The maximum number of backups to return. The response may contain
+  // less than the maximum number. If unspecified, no more than 500 backups are
   // returned. The maximum value is 1000; values above 1000 are changed to 1000.
   int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. A page token, received from a previous [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups]
+  // Optional. A page token, received from a previous
+  // [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups]
   // call. Provide this token to retrieve the subsequent page.
   //
   // To retrieve the first page, supply an empty page token.
   //
   // When paginating, other parameters provided to
-  // [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups] must match the call that provided the
-  // page token.
+  // [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups]
+  // must match the call that provided the page token.
   string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 
   // Optional. The filter to apply to list results.
@@ -997,7 +1041,8 @@ message ListBackupsRequest {
   string order_by = 5 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Response message for [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups].
+// Response message for
+// [DataprocMetastore.ListBackups][google.cloud.metastore.v1beta.DataprocMetastore.ListBackups].
 message ListBackupsResponse {
   // The backups of the specified service.
   repeated Backup backups = 1;
@@ -1010,7 +1055,8 @@ message ListBackupsResponse {
   repeated string unreachable = 3;
 }
 
-// Request message for [DataprocMetastore.GetBackup][google.cloud.metastore.v1beta.DataprocMetastore.GetBackup].
+// Request message for
+// [DataprocMetastore.GetBackup][google.cloud.metastore.v1beta.DataprocMetastore.GetBackup].
 message GetBackupRequest {
   // Required. The relative resource name of the backup to retrieve, in the
   // following form:
@@ -1024,10 +1070,11 @@ message GetBackupRequest {
   ];
 }
 
-// Request message for [DataprocMetastore.CreateBackup][google.cloud.metastore.v1beta.DataprocMetastore.CreateBackup].
+// Request message for
+// [DataprocMetastore.CreateBackup][google.cloud.metastore.v1beta.DataprocMetastore.CreateBackup].
 message CreateBackupRequest {
-  // Required. The relative resource name of the service in which to create a backup
-  // of the following form:
+  // Required. The relative resource name of the service in which to create a
+  // backup of the following form:
   //
   // `projects/{project_number}/locations/{location_id}/services/{service_id}`
   string parent = 1 [
@@ -1045,14 +1092,14 @@ message CreateBackupRequest {
   // or hyphens.
   string backup_id = 2 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. The backup to create. The `name` field is ignored. The ID of the created
-  // backup must be provided in the request's `backup_id` field.
+  // Required. The backup to create. The `name` field is ignored. The ID of the
+  // created backup must be provided in the request's `backup_id` field.
   Backup backup = 3 [(google.api.field_behavior) = REQUIRED];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -1064,7 +1111,8 @@ message CreateBackupRequest {
   string request_id = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [DataprocMetastore.DeleteBackup][google.cloud.metastore.v1beta.DataprocMetastore.DeleteBackup].
+// Request message for
+// [DataprocMetastore.DeleteBackup][google.cloud.metastore.v1beta.DataprocMetastore.DeleteBackup].
 message DeleteBackupRequest {
   // Required. The relative resource name of the backup to delete, in the
   // following form:
@@ -1077,10 +1125,10 @@ message DeleteBackupRequest {
     }
   ];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -1092,7 +1140,8 @@ message DeleteBackupRequest {
   string request_id = 2 [(google.api.field_behavior) = OPTIONAL];
 }
 
-// Request message for [DataprocMetastore.ExportMetadata][google.cloud.metastore.v1beta.DataprocMetastore.ExportMetadata].
+// Request message for
+// [DataprocMetastore.ExportMetadata][google.cloud.metastore.v1beta.DataprocMetastore.ExportMetadata].
 message ExportMetadataRequest {
   // Required. Destination that metadata is exported to.
   oneof destination {
@@ -1102,8 +1151,8 @@ message ExportMetadataRequest {
     string destination_gcs_folder = 2;
   }
 
-  // Required. The relative resource name of the metastore service to run export, in the
-  // following form:
+  // Required. The relative resource name of the metastore service to run
+  // export, in the following form:
   //
   // `projects/{project_id}/locations/{location_id}/services/{service_id}`
   string service = 1 [
@@ -1113,10 +1162,10 @@ message ExportMetadataRequest {
     }
   ];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -1127,14 +1176,16 @@ message ExportMetadataRequest {
   // A zero UUID (00000000-0000-0000-0000-000000000000) is not supported.
   string request_id = 3 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. The type of the database dump. If unspecified, defaults to `MYSQL`.
-  DatabaseDumpSpec.Type database_dump_type = 4 [(google.api.field_behavior) = OPTIONAL];
+  // Optional. The type of the database dump. If unspecified, defaults to
+  // `MYSQL`.
+  DatabaseDumpSpec.Type database_dump_type = 4
+      [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Request message for [DataprocMetastore.Restore][].
 message RestoreServiceRequest {
-  // Required. The relative resource name of the metastore service to run restore, in the
-  // following form:
+  // Required. The relative resource name of the metastore service to run
+  // restore, in the following form:
   //
   // `projects/{project_id}/locations/{location_id}/services/{service_id}`
   string service = 1 [
@@ -1144,8 +1195,8 @@ message RestoreServiceRequest {
     }
   ];
 
-  // Required. The relative resource name of the metastore service backup to restore
-  // from, in the following form:
+  // Required. The relative resource name of the metastore service backup to
+  // restore from, in the following form:
   //
   // `projects/{project_id}/locations/{location_id}/services/{service_id}/backups/{backup_id}`
   string backup = 2 [
@@ -1158,10 +1209,10 @@ message RestoreServiceRequest {
   // Optional. The type of restore. If unspecified, defaults to `METADATA_ONLY`.
   Restore.RestoreType restore_type = 3 [(google.api.field_behavior) = OPTIONAL];
 
-  // Optional. A request ID. Specify a unique request ID to allow the server to ignore the
-  // request if it has completed. The server will ignore subsequent requests
-  // that provide a duplicate request ID for at least 60 minutes after the first
-  // request.
+  // Optional. A request ID. Specify a unique request ID to allow the server to
+  // ignore the request if it has completed. The server will ignore subsequent
+  // requests that provide a duplicate request ID for at least 60 minutes after
+  // the first request.
   //
   // For example, if an initial request times out, followed by another request
   // with the same request ID, the server ignores the second request to prevent
@@ -1176,10 +1227,12 @@ message RestoreServiceRequest {
 // Represents the metadata of a long-running operation.
 message OperationMetadata {
   // Output only. The time the operation was created.
-  google.protobuf.Timestamp create_time = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp create_time = 1
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. The time the operation finished running.
-  google.protobuf.Timestamp end_time = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
+  google.protobuf.Timestamp end_time = 2
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. Server-defined resource path for the target of the operation.
   string target = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
@@ -1192,8 +1245,9 @@ message OperationMetadata {
 
   // Output only. Identifies whether the caller has requested cancellation
   // of the operation. Operations that have successfully been cancelled
-  // have [Operation.error][] value with a [google.rpc.Status.code][google.rpc.Status.code] of 1,
-  // corresponding to `Code.CANCELLED`.
+  // have [Operation.error][] value with a
+  // [google.rpc.Status.code][google.rpc.Status.code] of 1, corresponding to
+  // `Code.CANCELLED`.
   bool requested_cancellation = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Output only. API version used to start the operation.
@@ -1228,6 +1282,4 @@ message DatabaseDumpSpec {
     // Database dump is a MySQL dump file.
     MYSQL = 1;
   }
-
-
 }
diff --git a/google/cloud/metastore/v1beta/metastore_gapis.yaml b/google/cloud/metastore/v1beta/metastore_gapis.yaml
deleted file mode 100644
index d5c83a105..000000000
--- a/google/cloud/metastore/v1beta/metastore_gapis.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-type: com.google.api.codegen.ConfigProto
-config_schema_version: 2.0.0
-language_settings:
-  java:
-    package_name: com.google.cloud.metastore.v1beta
-  python:
-    package_name: google.cloud.metastore_v1beta.gapic
-  go:
-    package_name: cloud.google.com/go/metastore/apiv1beta
-  csharp:
-    package_name: Google.Cloud.Metastore.V1Beta
-  ruby:
-    package_name: Google::Cloud::Metastore::V1Beta
-  php:
-    package_name: Google\Cloud\Metastore\V1Beta
-  nodejs:
-    package_name: metastore.v1beta
-    domain_layer_location: google-cloud