diff --git a/packages/google-maps-fleetengine-delivery/.repo-metadata.json b/packages/google-maps-fleetengine-delivery/.repo-metadata.json
index b8b6f7eab3e0..cf9109b94414 100644
--- a/packages/google-maps-fleetengine-delivery/.repo-metadata.json
+++ b/packages/google-maps-fleetengine-delivery/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Enables Fleet Engine for access to the On Demand Rides and Deliveries and Last Mile Fleet Solution APIs.  Customer's use of Google Maps Content in the Cloud Logging Services is subject to the Google Maps Platform Terms of Service located at https://cloud.google.com/maps-platform/terms.",
-  "api_id": "fleetengine.googleapis.com",
-  "api_shortname": "fleetengine",
-  "client_documentation": "https://googleapis.dev/python/fleetengine-delivery/latest",
-  "default_version": "v1",
-  "distribution_name": "google-maps-fleetengine-delivery",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "fleetengine-delivery",
-  "name_pretty": "Last Mile Fleet Solution Delivery API",
-  "product_documentation": "https://developers.google.com/maps/documentation/transportation-logistics/mobility",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Enables Fleet Engine for access to the On Demand Rides and Deliveries and Last Mile Fleet Solution APIs.  Customer's use of Google Maps Content in the Cloud Logging Services is subject to the Google Maps Platform Terms of Service located at https://cloud.google.com/maps-platform/terms.",
+    "api_id": "fleetengine.googleapis.com",
+    "api_shortname": "fleetengine",
+    "client_documentation": "https://googleapis.dev/python/fleetengine-delivery/latest",
+    "default_version": "v1",
+    "distribution_name": "google-maps-fleetengine-delivery",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "fleetengine-delivery",
+    "name_pretty": "Last Mile Fleet Solution Delivery API",
+    "product_documentation": "https://developers.google.com/maps/documentation/transportation-logistics/mobility",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-maps-fleetengine/.repo-metadata.json b/packages/google-maps-fleetengine/.repo-metadata.json
index 7da92a594c06..bcf8f2e14d8b 100644
--- a/packages/google-maps-fleetengine/.repo-metadata.json
+++ b/packages/google-maps-fleetengine/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Enables Fleet Engine for access to the On Demand Rides and Deliveries and Last Mile Fleet Solution APIs.  Customer's use of Google Maps Content in the Cloud Logging Services is subject to the Google Maps Platform Terms of Service located at https://cloud.google.com/maps-platform/terms.",
-  "api_id": "fleetengine.googleapis.com",
-  "api_shortname": "fleetengine",
-  "client_documentation": "https://googleapis.dev/python/fleetengine/latest",
-  "default_version": "v1",
-  "distribution_name": "google-maps-fleetengine",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "fleetengine",
-  "name_pretty": "Local Rides and Deliveries API",
-  "product_documentation": "https://developers.google.com/maps/documentation/transportation-logistics/mobility",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Enables Fleet Engine for access to the On Demand Rides and Deliveries and Last Mile Fleet Solution APIs.  Customer's use of Google Maps Content in the Cloud Logging Services is subject to the Google Maps Platform Terms of Service located at https://cloud.google.com/maps-platform/terms.",
+    "api_id": "fleetengine.googleapis.com",
+    "api_shortname": "fleetengine",
+    "client_documentation": "https://googleapis.dev/python/fleetengine/latest",
+    "default_version": "v1",
+    "distribution_name": "google-maps-fleetengine",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "fleetengine",
+    "name_pretty": "Local Rides and Deliveries API",
+    "product_documentation": "https://developers.google.com/maps/documentation/transportation-logistics/mobility",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-maps-geocode/.repo-metadata.json b/packages/google-maps-geocode/.repo-metadata.json
index 6b14abc307a7..db8f46fb1eb8 100644
--- a/packages/google-maps-geocode/.repo-metadata.json
+++ b/packages/google-maps-geocode/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Convert addresses into geographic coordinates (geocoding), which you can\nuse     to place markers or position the map. This API also allows you to\nconvert     geographic coordinates into an address (reverse geocoding).",
-  "api_id": "geocoding-backend.googleapis.com",
-  "api_shortname": "geocoding-backend",
-  "client_documentation": "https://cloud.google.com/python/docs/reference/google-maps-geocode/latest",
-  "default_version": "v4",
-  "distribution_name": "google-maps-geocode",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=188871&template=788907",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-maps-geocode",
-  "name_pretty": "Geocoding API",
-  "product_documentation": "https://developers.google.com/maps/documentation/geocoding/overview",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
-}
+    "api_description": "Convert addresses into geographic coordinates (geocoding), which you can\nuse     to place markers or position the map. This API also allows you to\nconvert     geographic coordinates into an address (reverse geocoding).",
+    "api_id": "geocoding-backend.googleapis.com",
+    "api_shortname": "geocoding-backend",
+    "client_documentation": "https://cloud.google.com/python/docs/reference/google-maps-geocode/latest",
+    "default_version": "v4",
+    "distribution_name": "google-maps-geocode",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=188871\u0026template=788907",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-maps-geocode",
+    "name_pretty": "Geocoding API",
+    "product_documentation": "https://developers.google.com/maps/documentation/geocoding/overview",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
+}
\ No newline at end of file
diff --git a/packages/google-maps-mapsplatformdatasets/.repo-metadata.json b/packages/google-maps-mapsplatformdatasets/.repo-metadata.json
index 8cd808757440..1c91363cee98 100644
--- a/packages/google-maps-mapsplatformdatasets/.repo-metadata.json
+++ b/packages/google-maps-mapsplatformdatasets/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Maps Platform Datasets API",
-  "api_id": "mapsplatformdatasets.googleapis.com",
-  "api_shortname": "mapsplatformdatasets",
-  "client_documentation": "https://googleapis.dev/python/mapsplatformdatasets/latest",
-  "default_version": "v1",
-  "distribution_name": "google-maps-mapsplatformdatasets",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "mapsplatformdatasets",
-  "name_pretty": "Maps Platform Datasets API",
-  "product_documentation": "https://developers.google.com/maps",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Maps Platform Datasets API",
+    "api_id": "mapsplatformdatasets.googleapis.com",
+    "api_shortname": "mapsplatformdatasets",
+    "client_documentation": "https://googleapis.dev/python/mapsplatformdatasets/latest",
+    "default_version": "v1",
+    "distribution_name": "google-maps-mapsplatformdatasets",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "mapsplatformdatasets",
+    "name_pretty": "Maps Platform Datasets API",
+    "product_documentation": "https://developers.google.com/maps",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-maps-navconnect/.repo-metadata.json b/packages/google-maps-navconnect/.repo-metadata.json
index 05a0de175b58..f7ae27b4e2aa 100644
--- a/packages/google-maps-navconnect/.repo-metadata.json
+++ b/packages/google-maps-navconnect/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Navigation Connect API.",
-  "api_id": "navigationconnect.googleapis.com",
-  "api_shortname": "navigationconnect",
-  "client_documentation": "https://cloud.google.com/python/docs/reference/google-maps-navconnect/latest",
-  "default_version": "v1",
-  "distribution_name": "google-maps-navconnect",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=1180397&template=1812135",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-maps-navconnect",
-  "name_pretty": "Navigation Connect API",
-  "product_documentation": "https://developers.google.com/maps/documentation/mobility/navigationconnect",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
-}
+    "api_description": "Navigation Connect API.",
+    "api_id": "navigationconnect.googleapis.com",
+    "api_shortname": "navigationconnect",
+    "client_documentation": "https://cloud.google.com/python/docs/reference/google-maps-navconnect/latest",
+    "default_version": "v1",
+    "distribution_name": "google-maps-navconnect",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=1180397\u0026template=1812135",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-maps-navconnect",
+    "name_pretty": "Navigation Connect API",
+    "product_documentation": "https://developers.google.com/maps/documentation/mobility/navigationconnect",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
+}
\ No newline at end of file
diff --git a/packages/google-maps-places/.repo-metadata.json b/packages/google-maps-places/.repo-metadata.json
index 37a39d31528f..28548ad6528b 100644
--- a/packages/google-maps-places/.repo-metadata.json
+++ b/packages/google-maps-places/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "The Places API allows developers to access a variety of search and retrieval endpoints for a Place.",
-  "api_id": "places.googleapis.com",
-  "api_shortname": "places",
-  "client_documentation": "https://googleapis.dev/python/places/latest",
-  "default_version": "v1",
-  "distribution_name": "google-maps-places",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "places",
-  "name_pretty": "Places API",
-  "product_documentation": "https://developers.google.com/maps/documentation/places/web-service/",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "The Places API allows developers to access a variety of search and retrieval endpoints for a Place.",
+    "api_id": "places.googleapis.com",
+    "api_shortname": "places",
+    "client_documentation": "https://googleapis.dev/python/places/latest",
+    "default_version": "v1",
+    "distribution_name": "google-maps-places",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "places",
+    "name_pretty": "Places API",
+    "product_documentation": "https://developers.google.com/maps/documentation/places/web-service/",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-maps-routeoptimization/.repo-metadata.json b/packages/google-maps-routeoptimization/.repo-metadata.json
index 39e7d7e0b618..446c4cf6cbdd 100644
--- a/packages/google-maps-routeoptimization/.repo-metadata.json
+++ b/packages/google-maps-routeoptimization/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "The Route Optimization API assigns tasks and routes to a vehicle fleet, optimizing against the objectives and constraints that you supply for your transportation goals.",
-  "api_id": "routeoptimization.googleapis.com",
-  "api_shortname": "routeoptimization",
-  "client_documentation": "https://googleapis.dev/python/google-maps-routeoptimization/latest",
-  "default_version": "v1",
-  "distribution_name": "google-maps-routeoptimization",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=1546507",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-maps-routeoptimization",
-  "name_pretty": "Route Optimization API",
-  "product_documentation": "https://developers.google.com/maps/documentation/route-optimization",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "The Route Optimization API assigns tasks and routes to a vehicle fleet, optimizing against the objectives and constraints that you supply for your transportation goals.",
+    "api_id": "routeoptimization.googleapis.com",
+    "api_shortname": "routeoptimization",
+    "client_documentation": "https://googleapis.dev/python/google-maps-routeoptimization/latest",
+    "default_version": "v1",
+    "distribution_name": "google-maps-routeoptimization",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=1546507",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-maps-routeoptimization",
+    "name_pretty": "Route Optimization API",
+    "product_documentation": "https://developers.google.com/maps/documentation/route-optimization",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-maps-routing/.repo-metadata.json b/packages/google-maps-routing/.repo-metadata.json
index 5d8e95f0995d..faa378482197 100644
--- a/packages/google-maps-routing/.repo-metadata.json
+++ b/packages/google-maps-routing/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Help your users find the ideal way to get from A to Z with comprehensive data and real-time traffic.",
-  "api_id": "routing.googleapis.com",
-  "api_shortname": "routing",
-  "client_documentation": "https://googleapis.dev/python/routing/latest",
-  "default_version": "v2",
-  "distribution_name": "google-maps-routing",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "routing",
-  "name_pretty": "Google Maps Routing",
-  "product_documentation": "https://mapsplatform.google.com/maps-products/#routes-section",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Help your users find the ideal way to get from A to Z with comprehensive data and real-time traffic.",
+    "api_id": "routing.googleapis.com",
+    "api_shortname": "routing",
+    "client_documentation": "https://googleapis.dev/python/routing/latest",
+    "default_version": "v2",
+    "distribution_name": "google-maps-routing",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "routing",
+    "name_pretty": "Google Maps Routing",
+    "product_documentation": "https://mapsplatform.google.com/maps-products/#routes-section",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-maps-solar/.repo-metadata.json b/packages/google-maps-solar/.repo-metadata.json
index 99bbe49a41ef..1113f1859211 100644
--- a/packages/google-maps-solar/.repo-metadata.json
+++ b/packages/google-maps-solar/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "The Google Maps Platform Solar API is a service focused on helping accelerate solar and energy system installations.",
-  "api_id": "solar.googleapis.com",
-  "api_shortname": "solar",
-  "client_documentation": "https://googleapis.dev/python/google-maps-solar/latest",
-  "default_version": "v1",
-  "distribution_name": "google-maps-solar",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=1356349",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-maps-solar",
-  "name_pretty": "Solar API",
-  "product_documentation": "https://developers.google.com/maps/documentation/solar/overview",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "The Google Maps Platform Solar API is a service focused on helping accelerate solar and energy system installations.",
+    "api_id": "solar.googleapis.com",
+    "api_shortname": "solar",
+    "client_documentation": "https://googleapis.dev/python/google-maps-solar/latest",
+    "default_version": "v1",
+    "distribution_name": "google-maps-solar",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=1356349",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-maps-solar",
+    "name_pretty": "Solar API",
+    "product_documentation": "https://developers.google.com/maps/documentation/solar/overview",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-resumable-media/.repo-metadata.json b/packages/google-resumable-media/.repo-metadata.json
index 1e4c926f061e..0a2cb7cb8dc2 100644
--- a/packages/google-resumable-media/.repo-metadata.json
+++ b/packages/google-resumable-media/.repo-metadata.json
@@ -1,12 +1,10 @@
 {
-    "name": "google-resumable-media",
-    "name_pretty": "Google Resumable Media",
     "client_documentation": "https://cloud.google.com/python/docs/reference/google-resumable-media/latest",
-    "release_level": "preview",
+    "distribution_name": "google-resumable-media",
     "language": "python",
     "library_type": "CORE",
-    "repo": "googleapis/google-resumable-media-python",
-    "distribution_name": "google-resumable-media",
-    "default_version": "",
-    "codeowner_team": "@googleapis/gcs-team"
-}
+    "name": "google-resumable-media",
+    "name_pretty": "Google Resumable Media",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
+}
\ No newline at end of file
diff --git a/packages/google-shopping-css/.repo-metadata.json b/packages/google-shopping-css/.repo-metadata.json
index e2570dfb5ff0..e201818df629 100644
--- a/packages/google-shopping-css/.repo-metadata.json
+++ b/packages/google-shopping-css/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Comparison Shopping Service (CSS) account data at scale.",
-  "api_id": "css.googleapis.com",
-  "api_shortname": "css",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-css/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-css",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=826068&template=1564577",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-css",
-  "name_pretty": "CSS API",
-  "product_documentation": "https://developers.google.com/comparison-shopping-services/api",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Comparison Shopping Service (CSS) account data at scale.",
+    "api_id": "css.googleapis.com",
+    "api_shortname": "css",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-css/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-css",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=826068\u0026template=1564577",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-css",
+    "name_pretty": "CSS API",
+    "product_documentation": "https://developers.google.com/comparison-shopping-services/api",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-accounts/.repo-metadata.json b/packages/google-shopping-merchant-accounts/.repo-metadata.json
index a171bbb4c4e9..ac4d4243839c 100644
--- a/packages/google-shopping-merchant-accounts/.repo-metadata.json
+++ b/packages/google-shopping-merchant-accounts/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "accounts.googleapis.com",
-  "api_shortname": "accounts",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-accounts/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-accounts",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-accounts",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "accounts.googleapis.com",
+    "api_shortname": "accounts",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-accounts/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-accounts",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-accounts",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-conversions/.repo-metadata.json b/packages/google-shopping-merchant-conversions/.repo-metadata.json
index 5c95a9fd175d..ad46ef99f142 100644
--- a/packages/google-shopping-merchant-conversions/.repo-metadata.json
+++ b/packages/google-shopping-merchant-conversions/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "merchantapi.googleapis.com",
-  "api_shortname": "conversions",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-conversions/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-conversions",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-conversions",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "merchantapi.googleapis.com",
+    "api_shortname": "conversions",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-conversions/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-conversions",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-conversions",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-datasources/.repo-metadata.json b/packages/google-shopping-merchant-datasources/.repo-metadata.json
index efd2cd386222..d65852216931 100644
--- a/packages/google-shopping-merchant-datasources/.repo-metadata.json
+++ b/packages/google-shopping-merchant-datasources/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "datasources.googleapis.com",
-  "api_shortname": "datasources",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-datasources/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-datasources",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-datasources",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "datasources.googleapis.com",
+    "api_shortname": "datasources",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-datasources/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-datasources",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-datasources",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-inventories/.repo-metadata.json b/packages/google-shopping-merchant-inventories/.repo-metadata.json
index 972667d207d9..20f3dcaca510 100644
--- a/packages/google-shopping-merchant-inventories/.repo-metadata.json
+++ b/packages/google-shopping-merchant-inventories/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "inventories.googleapis.com",
-  "api_shortname": "inventories",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-inventories/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-inventories",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084&template=555201",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-inventories",
-  "name_pretty": "Merchant Inventories API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "inventories.googleapis.com",
+    "api_shortname": "inventories",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-inventories/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-inventories",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084\u0026template=555201",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-inventories",
+    "name_pretty": "Merchant Inventories API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-issueresolution/.repo-metadata.json b/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
index 3a7a7ef0b1c6..2640c24c107b 100644
--- a/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
+++ b/packages/google-shopping-merchant-issueresolution/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center Accounts. ",
-  "api_id": "issueresolution.googleapis.com",
-  "api_shortname": "issueresolution",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-issueresolution/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-issueresolution",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084&template=555201",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-issueresolution",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center Accounts. ",
+    "api_id": "issueresolution.googleapis.com",
+    "api_shortname": "issueresolution",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-issueresolution/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-issueresolution",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084\u0026template=555201",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-issueresolution",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-lfp/.repo-metadata.json b/packages/google-shopping-merchant-lfp/.repo-metadata.json
index d1c737c13fc9..4d6293c99ad9 100644
--- a/packages/google-shopping-merchant-lfp/.repo-metadata.json
+++ b/packages/google-shopping-merchant-lfp/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "merchantapi.googleapis.com",
-  "api_shortname": "lfp",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-lfp/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-lfp",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-lfp",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "merchantapi.googleapis.com",
+    "api_shortname": "lfp",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-lfp/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-lfp",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-lfp",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-notifications/.repo-metadata.json b/packages/google-shopping-merchant-notifications/.repo-metadata.json
index 199a58f0cd5a..4a9df3662c68 100644
--- a/packages/google-shopping-merchant-notifications/.repo-metadata.json
+++ b/packages/google-shopping-merchant-notifications/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "merchantapi.googleapis.com",
-  "api_shortname": "notifications",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-notifications/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-notifications",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-notifications",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "merchantapi.googleapis.com",
+    "api_shortname": "notifications",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-notifications/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-notifications",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-notifications",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-ordertracking/.repo-metadata.json b/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
index 1969d82c03bc..8f0648de46ce 100644
--- a/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
+++ b/packages/google-shopping-merchant-ordertracking/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center Accounts. ",
-  "api_id": "ordertracking.googleapis.com",
-  "api_shortname": "ordertracking",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-ordertracking/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-ordertracking",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084&template=555201",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-ordertracking",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center Accounts. ",
+    "api_id": "ordertracking.googleapis.com",
+    "api_shortname": "ordertracking",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-ordertracking/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-ordertracking",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084\u0026template=555201",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-ordertracking",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-products/.repo-metadata.json b/packages/google-shopping-merchant-products/.repo-metadata.json
index 603f7240d8a3..e2a2a848d4ff 100644
--- a/packages/google-shopping-merchant-products/.repo-metadata.json
+++ b/packages/google-shopping-merchant-products/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "products.googleapis.com",
-  "api_shortname": "products",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-products/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-products",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-products",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "products.googleapis.com",
+    "api_shortname": "products",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-products/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-products",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-products",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-productstudio/.repo-metadata.json b/packages/google-shopping-merchant-productstudio/.repo-metadata.json
index 61fea277ff14..b275d79aada9 100644
--- a/packages/google-shopping-merchant-productstudio/.repo-metadata.json
+++ b/packages/google-shopping-merchant-productstudio/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "productstudio.googleapis.com",
-  "api_shortname": "productstudio",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-productstudio/latest",
-  "default_version": "v1alpha",
-  "distribution_name": "google-shopping-merchant-productstudio",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-productstudio",
-  "name_pretty": "Merchant ProductStudio API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "productstudio.googleapis.com",
+    "api_shortname": "productstudio",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-productstudio/latest",
+    "default_version": "v1alpha",
+    "distribution_name": "google-shopping-merchant-productstudio",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-productstudio",
+    "name_pretty": "Merchant ProductStudio API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-promotions/.repo-metadata.json b/packages/google-shopping-merchant-promotions/.repo-metadata.json
index ec01ad8668ed..302876816854 100644
--- a/packages/google-shopping-merchant-promotions/.repo-metadata.json
+++ b/packages/google-shopping-merchant-promotions/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "promotions.googleapis.com",
-  "api_shortname": "promotions",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-promotions/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-promotions",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-promotions",
-  "name_pretty": "Merchant API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "promotions.googleapis.com",
+    "api_shortname": "promotions",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-promotions/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-promotions",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-promotions",
+    "name_pretty": "Merchant API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-quota/.repo-metadata.json b/packages/google-shopping-merchant-quota/.repo-metadata.json
index 14c8ed2d65e5..515cd01820d1 100644
--- a/packages/google-shopping-merchant-quota/.repo-metadata.json
+++ b/packages/google-shopping-merchant-quota/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts.",
-  "api_id": "merchantapi.googleapis.com",
-  "api_shortname": "merchantapi",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-quota/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-quota",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084&template=555201",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-quota",
-  "name_pretty": "Shopping Merchant Quota",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts.",
+    "api_id": "merchantapi.googleapis.com",
+    "api_shortname": "merchantapi",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-quota/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-quota",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084\u0026template=555201",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-quota",
+    "name_pretty": "Shopping Merchant Quota",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-reports/.repo-metadata.json b/packages/google-shopping-merchant-reports/.repo-metadata.json
index 4ed851cb7301..f93ddb2621a2 100644
--- a/packages/google-shopping-merchant-reports/.repo-metadata.json
+++ b/packages/google-shopping-merchant-reports/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center accounts",
-  "api_id": "reports.googleapis.com",
-  "api_shortname": "reports",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-reports/latest",
-  "default_version": "v1",
-  "distribution_name": "google-shopping-merchant-reports",
-  "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084&template=555201",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-reports",
-  "name_pretty": "Merchant Reports API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center accounts",
+    "api_id": "reports.googleapis.com",
+    "api_shortname": "reports",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-reports/latest",
+    "default_version": "v1",
+    "distribution_name": "google-shopping-merchant-reports",
+    "issue_tracker": "https://issuetracker.google.com/issues/new?component=171084\u0026template=555201",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-reports",
+    "name_pretty": "Merchant Reports API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-merchant-reviews/.repo-metadata.json b/packages/google-shopping-merchant-reviews/.repo-metadata.json
index c051782afedd..68c0675a5f54 100644
--- a/packages/google-shopping-merchant-reviews/.repo-metadata.json
+++ b/packages/google-shopping-merchant-reviews/.repo-metadata.json
@@ -1,16 +1,16 @@
 {
-  "api_description": "Programmatically manage your Merchant Center Accounts",
-  "api_id": "reviews.googleapis.com",
-  "api_shortname": "reviews",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-reviews/latest",
-  "default_version": "v1beta",
-  "distribution_name": "google-shopping-merchant-reviews",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-merchant-reviews",
-  "name_pretty": "Merchant Reviews API",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "preview",
-  "repo": "googleapis/google-cloud-python"
+    "api_description": "Programmatically manage your Merchant Center Accounts",
+    "api_id": "reviews.googleapis.com",
+    "api_shortname": "reviews",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-merchant-reviews/latest",
+    "default_version": "v1beta",
+    "distribution_name": "google-shopping-merchant-reviews",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-merchant-reviews",
+    "name_pretty": "Merchant Reviews API",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "preview",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/google-shopping-type/.repo-metadata.json b/packages/google-shopping-type/.repo-metadata.json
index 4608e831c585..47d61649c3ea 100644
--- a/packages/google-shopping-type/.repo-metadata.json
+++ b/packages/google-shopping-type/.repo-metadata.json
@@ -1,16 +1,15 @@
 {
-  "api_description": "",
-  "api_id": "type.googleapis.com",
-  "api_shortname": "type",
-  "client_documentation": "https://googleapis.dev/python/google-shopping-type/latest",
-  "default_version": "apiVersion",
-  "distribution_name": "google-shopping-type",
-  "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-  "language": "python",
-  "library_type": "GAPIC_AUTO",
-  "name": "google-shopping-type",
-  "name_pretty": "Shopping Type Protos",
-  "product_documentation": "https://developers.google.com/merchant/api",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python"
+    "api_id": "type.googleapis.com",
+    "api_shortname": "type",
+    "client_documentation": "https://googleapis.dev/python/google-shopping-type/latest",
+    "default_version": "apiVersion",
+    "distribution_name": "google-shopping-type",
+    "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
+    "language": "python",
+    "library_type": "GAPIC_AUTO",
+    "name": "google-shopping-type",
+    "name_pretty": "Shopping Type Protos",
+    "product_documentation": "https://developers.google.com/merchant/api",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/grafeas/.repo-metadata.json b/packages/grafeas/.repo-metadata.json
index 4afe408c22ad..1a27f0de19bb 100644
--- a/packages/grafeas/.repo-metadata.json
+++ b/packages/grafeas/.repo-metadata.json
@@ -1,17 +1,15 @@
 {
-  "api_description": "An implementation of the Grafeas API, which stores, and enables querying and retrieval of critical metadata about all of your software artifacts.",
-  "api_id": "containeranalysis.googleapis.com",
-  "api_shortname": "containeranalysis",
-  "client_documentation": "https://googleapis.dev/python/grafeas/latest",
-  "default_version": "v1",
-  "distribution_name": "grafeas",
-  "issue_tracker": "",
-  "language": "python",
-  "library_type": "GAPIC_COMBO",
-  "name": "grafeas",
-  "name_pretty": "Grafeas",
-  "product_documentation": "https://grafeas.io",
-  "release_level": "stable",
-  "repo": "googleapis/google-cloud-python",
-  "requires_billing": false
+    "api_description": "An implementation of the Grafeas API, which stores, and enables querying and retrieval of critical metadata about all of your software artifacts.",
+    "api_id": "containeranalysis.googleapis.com",
+    "api_shortname": "containeranalysis",
+    "client_documentation": "https://googleapis.dev/python/grafeas/latest",
+    "default_version": "v1",
+    "distribution_name": "grafeas",
+    "language": "python",
+    "library_type": "GAPIC_COMBO",
+    "name": "grafeas",
+    "name_pretty": "Grafeas",
+    "product_documentation": "https://grafeas.io",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
 }
\ No newline at end of file
diff --git a/packages/proto-plus/.repo-metadata.json b/packages/proto-plus/.repo-metadata.json
index a44ac6d9fa37..cb51534a2154 100644
--- a/packages/proto-plus/.repo-metadata.json
+++ b/packages/proto-plus/.repo-metadata.json
@@ -1,13 +1,11 @@
 {
-    "name": "proto-plus",
-    "name_pretty": "Proto Plus",
     "client_documentation": "https://googleapis.dev/python/proto-plus/latest",
+    "distribution_name": "proto-plus",
     "issue_tracker": "https://github.com/googleapis/google-cloud-python/issues",
-    "release_level": "stable",
     "language": "python",
     "library_type": "CORE",
-    "repo": "googleapis/google-cloud-python",
-    "distribution_name": "proto-plus",
-    "default_version": "",
-    "codeowner_team": ""
-}
+    "name": "proto-plus",
+    "name_pretty": "Proto Plus",
+    "release_level": "stable",
+    "repo": "googleapis/google-cloud-python"
+}
\ No newline at end of file