diff --git a/generation_config.yaml b/generation_config.yaml
index 484c904e7a..b6b681dc07 100644
--- a/generation_config.yaml
+++ b/generation_config.yaml
@@ -1,4 +1,4 @@
-googleapis_commitish: 537fd482f6bb8afb3a146d9b21673a8eb27958bd
+googleapis_commitish: 6b5d85c66e0885b1665040f6f80b2401f60c1068
# the libraries are ordered with respect to library name, which is
# java-{library.library_name} or java-{library.api-shortname} when
# library.library_name is not defined.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java
index 3f33631b0f..86a8da410d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/ClientProto.java
@@ -292,53 +292,54 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "alue\030\002 \001(\t:\0028\001\"A\n\013CppSettings\0222\n\006common\030"
+ "\001 \001(\0132\".google.api.CommonLanguageSetting"
+ "s\"A\n\013PhpSettings\0222\n\006common\030\001 \001(\0132\".googl"
- + "e.api.CommonLanguageSettings\"\313\001\n\016PythonS"
+ + "e.api.CommonLanguageSettings\"\364\001\n\016PythonS"
+ "ettings\0222\n\006common\030\001 \001(\0132\".google.api.Com"
+ "monLanguageSettings\022N\n\025experimental_feat"
+ "ures\030\002 \001(\0132/.google.api.PythonSettings.E"
- + "xperimentalFeatures\0325\n\024ExperimentalFeatu"
- + "res\022\035\n\025rest_async_io_enabled\030\001 \001(\010\"B\n\014No"
- + "deSettings\0222\n\006common\030\001 \001(\0132\".google.api."
- + "CommonLanguageSettings\"\252\003\n\016DotnetSetting"
- + "s\0222\n\006common\030\001 \001(\0132\".google.api.CommonLan"
- + "guageSettings\022I\n\020renamed_services\030\002 \003(\0132"
- + "/.google.api.DotnetSettings.RenamedServi"
- + "cesEntry\022K\n\021renamed_resources\030\003 \003(\01320.go"
- + "ogle.api.DotnetSettings.RenamedResources"
- + "Entry\022\031\n\021ignored_resources\030\004 \003(\t\022 \n\030forc"
- + "ed_namespace_aliases\030\005 \003(\t\022\036\n\026handwritte"
- + "n_signatures\030\006 \003(\t\0326\n\024RenamedServicesEnt"
- + "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0327\n\025Re"
- + "namedResourcesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu"
- + "e\030\002 \001(\t:\0028\001\"B\n\014RubySettings\0222\n\006common\030\001 "
- + "\001(\0132\".google.api.CommonLanguageSettings\""
- + "@\n\nGoSettings\0222\n\006common\030\001 \001(\0132\".google.a"
- + "pi.CommonLanguageSettings\"\317\002\n\016MethodSett"
- + "ings\022\020\n\010selector\030\001 \001(\t\022<\n\014long_running\030\002"
- + " \001(\0132&.google.api.MethodSettings.LongRun"
- + "ning\022\035\n\025auto_populated_fields\030\003 \003(\t\032\315\001\n\013"
- + "LongRunning\0225\n\022initial_poll_delay\030\001 \001(\0132"
- + "\031.google.protobuf.Duration\022\035\n\025poll_delay"
- + "_multiplier\030\002 \001(\002\0221\n\016max_poll_delay\030\003 \001("
- + "\0132\031.google.protobuf.Duration\0225\n\022total_po"
- + "ll_timeout\030\004 \001(\0132\031.google.protobuf.Durat"
- + "ion\"+\n\030SelectiveGapicGeneration\022\017\n\007metho"
- + "ds\030\001 \003(\t*\243\001\n\031ClientLibraryOrganization\022+"
- + "\n\'CLIENT_LIBRARY_ORGANIZATION_UNSPECIFIE"
- + "D\020\000\022\t\n\005CLOUD\020\001\022\007\n\003ADS\020\002\022\n\n\006PHOTOS\020\003\022\017\n\013S"
- + "TREET_VIEW\020\004\022\014\n\010SHOPPING\020\005\022\007\n\003GEO\020\006\022\021\n\rG"
- + "ENERATIVE_AI\020\007*g\n\030ClientLibraryDestinati"
- + "on\022*\n&CLIENT_LIBRARY_DESTINATION_UNSPECI"
- + "FIED\020\000\022\n\n\006GITHUB\020\n\022\023\n\017PACKAGE_MANAGER\020\024:"
- + "9\n\020method_signature\022\036.google.protobuf.Me"
- + "thodOptions\030\233\010 \003(\t:6\n\014default_host\022\037.goo"
- + "gle.protobuf.ServiceOptions\030\231\010 \001(\t:6\n\014oa"
- + "uth_scopes\022\037.google.protobuf.ServiceOpti"
- + "ons\030\232\010 \001(\t:8\n\013api_version\022\037.google.proto"
- + "buf.ServiceOptions\030\301\272\253\372\001 \001(\tBi\n\016com.goog"
- + "le.apiB\013ClientProtoP\001ZAgoogle.golang.org"
- + "/genproto/googleapis/api/annotations;ann"
- + "otations\242\002\004GAPIb\006proto3"
+ + "xperimentalFeatures\032^\n\024ExperimentalFeatu"
+ + "res\022\035\n\025rest_async_io_enabled\030\001 \001(\010\022\'\n\037pr"
+ + "otobuf_pythonic_types_enabled\030\002 \001(\010\"B\n\014N"
+ + "odeSettings\0222\n\006common\030\001 \001(\0132\".google.api"
+ + ".CommonLanguageSettings\"\252\003\n\016DotnetSettin"
+ + "gs\0222\n\006common\030\001 \001(\0132\".google.api.CommonLa"
+ + "nguageSettings\022I\n\020renamed_services\030\002 \003(\013"
+ + "2/.google.api.DotnetSettings.RenamedServ"
+ + "icesEntry\022K\n\021renamed_resources\030\003 \003(\01320.g"
+ + "oogle.api.DotnetSettings.RenamedResource"
+ + "sEntry\022\031\n\021ignored_resources\030\004 \003(\t\022 \n\030for"
+ + "ced_namespace_aliases\030\005 \003(\t\022\036\n\026handwritt"
+ + "en_signatures\030\006 \003(\t\0326\n\024RenamedServicesEn"
+ + "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0327\n\025R"
+ + "enamedResourcesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val"
+ + "ue\030\002 \001(\t:\0028\001\"B\n\014RubySettings\0222\n\006common\030\001"
+ + " \001(\0132\".google.api.CommonLanguageSettings"
+ + "\"@\n\nGoSettings\0222\n\006common\030\001 \001(\0132\".google."
+ + "api.CommonLanguageSettings\"\317\002\n\016MethodSet"
+ + "tings\022\020\n\010selector\030\001 \001(\t\022<\n\014long_running\030"
+ + "\002 \001(\0132&.google.api.MethodSettings.LongRu"
+ + "nning\022\035\n\025auto_populated_fields\030\003 \003(\t\032\315\001\n"
+ + "\013LongRunning\0225\n\022initial_poll_delay\030\001 \001(\013"
+ + "2\031.google.protobuf.Duration\022\035\n\025poll_dela"
+ + "y_multiplier\030\002 \001(\002\0221\n\016max_poll_delay\030\003 \001"
+ + "(\0132\031.google.protobuf.Duration\0225\n\022total_p"
+ + "oll_timeout\030\004 \001(\0132\031.google.protobuf.Dura"
+ + "tion\"+\n\030SelectiveGapicGeneration\022\017\n\007meth"
+ + "ods\030\001 \003(\t*\243\001\n\031ClientLibraryOrganization\022"
+ + "+\n\'CLIENT_LIBRARY_ORGANIZATION_UNSPECIFI"
+ + "ED\020\000\022\t\n\005CLOUD\020\001\022\007\n\003ADS\020\002\022\n\n\006PHOTOS\020\003\022\017\n\013"
+ + "STREET_VIEW\020\004\022\014\n\010SHOPPING\020\005\022\007\n\003GEO\020\006\022\021\n\r"
+ + "GENERATIVE_AI\020\007*g\n\030ClientLibraryDestinat"
+ + "ion\022*\n&CLIENT_LIBRARY_DESTINATION_UNSPEC"
+ + "IFIED\020\000\022\n\n\006GITHUB\020\n\022\023\n\017PACKAGE_MANAGER\020\024"
+ + ":9\n\020method_signature\022\036.google.protobuf.M"
+ + "ethodOptions\030\233\010 \003(\t:6\n\014default_host\022\037.go"
+ + "ogle.protobuf.ServiceOptions\030\231\010 \001(\t:6\n\014o"
+ + "auth_scopes\022\037.google.protobuf.ServiceOpt"
+ + "ions\030\232\010 \001(\t:8\n\013api_version\022\037.google.prot"
+ + "obuf.ServiceOptions\030\301\272\253\372\001 \001(\tBi\n\016com.goo"
+ + "gle.apiB\013ClientProtoP\001ZAgoogle.golang.or"
+ + "g/genproto/googleapis/api/annotations;an"
+ + "notations\242\002\004GAPIb\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -433,7 +434,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_api_PythonSettings_ExperimentalFeatures_descriptor,
new java.lang.String[] {
- "RestAsyncIoEnabled",
+ "RestAsyncIoEnabled", "ProtobufPythonicTypesEnabled",
});
internal_static_google_api_NodeSettings_descriptor = getDescriptor().getMessageTypes().get(7);
internal_static_google_api_NodeSettings_fieldAccessorTable =
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java
index 97e6daa43f..c43d36461d 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/HttpBodyProto.java
@@ -44,10 +44,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"\n\031google/api/httpbody.proto\022\ngoogle.api\032"
+ "\031google/protobuf/any.proto\"X\n\010HttpBody\022\024"
+ "\n\014content_type\030\001 \001(\t\022\014\n\004data\030\002 \001(\014\022(\n\nex"
- + "tensions\030\003 \003(\0132\024.google.protobuf.AnyBh\n\016"
+ + "tensions\030\003 \003(\0132\024.google.protobuf.AnyBe\n\016"
+ "com.google.apiB\rHttpBodyProtoP\001Z;google."
+ "golang.org/genproto/googleapis/api/httpb"
- + "ody;httpbody\370\001\001\242\002\004GAPIb\006proto3"
+ + "ody;httpbody\242\002\004GAPIb\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java
index bda54c7919..2f84ad752c 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/PythonSettings.java
@@ -78,6 +78,22 @@ public interface ExperimentalFeaturesOrBuilder
* @return The restAsyncIoEnabled.
*/
boolean getRestAsyncIoEnabled();
+
+ /**
+ *
+ *
+ *
+ * Enables generation of protobuf code using new types that are more
+ * Pythonic which are included in `protobuf>=5.29.x`. This feature will be
+ * enabled by default 1 month after launching the feature in preview
+ * packages.
+ *
+ *
+ * bool protobuf_pythonic_types_enabled = 2;
+ *
+ * @return The protobufPythonicTypesEnabled.
+ */
+ boolean getProtobufPythonicTypesEnabled();
}
/**
*
@@ -144,6 +160,27 @@ public boolean getRestAsyncIoEnabled() {
return restAsyncIoEnabled_;
}
+ public static final int PROTOBUF_PYTHONIC_TYPES_ENABLED_FIELD_NUMBER = 2;
+ private boolean protobufPythonicTypesEnabled_ = false;
+ /**
+ *
+ *
+ *
+ * Enables generation of protobuf code using new types that are more
+ * Pythonic which are included in `protobuf>=5.29.x`. This feature will be
+ * enabled by default 1 month after launching the feature in preview
+ * packages.
+ *
+ *
+ * bool protobuf_pythonic_types_enabled = 2;
+ *
+ * @return The protobufPythonicTypesEnabled.
+ */
+ @java.lang.Override
+ public boolean getProtobufPythonicTypesEnabled() {
+ return protobufPythonicTypesEnabled_;
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -161,6 +198,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (restAsyncIoEnabled_ != false) {
output.writeBool(1, restAsyncIoEnabled_);
}
+ if (protobufPythonicTypesEnabled_ != false) {
+ output.writeBool(2, protobufPythonicTypesEnabled_);
+ }
getUnknownFields().writeTo(output);
}
@@ -173,6 +213,10 @@ public int getSerializedSize() {
if (restAsyncIoEnabled_ != false) {
size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, restAsyncIoEnabled_);
}
+ if (protobufPythonicTypesEnabled_ != false) {
+ size +=
+ com.google.protobuf.CodedOutputStream.computeBoolSize(2, protobufPythonicTypesEnabled_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -190,6 +234,8 @@ public boolean equals(final java.lang.Object obj) {
(com.google.api.PythonSettings.ExperimentalFeatures) obj;
if (getRestAsyncIoEnabled() != other.getRestAsyncIoEnabled()) return false;
+ if (getProtobufPythonicTypesEnabled() != other.getProtobufPythonicTypesEnabled())
+ return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -203,6 +249,9 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + REST_ASYNC_IO_ENABLED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getRestAsyncIoEnabled());
+ hash = (37 * hash) + PROTOBUF_PYTHONIC_TYPES_ENABLED_FIELD_NUMBER;
+ hash =
+ (53 * hash) + com.google.protobuf.Internal.hashBoolean(getProtobufPythonicTypesEnabled());
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -347,6 +396,7 @@ public Builder clear() {
super.clear();
bitField0_ = 0;
restAsyncIoEnabled_ = false;
+ protobufPythonicTypesEnabled_ = false;
return this;
}
@@ -386,6 +436,9 @@ private void buildPartial0(com.google.api.PythonSettings.ExperimentalFeatures re
if (((from_bitField0_ & 0x00000001) != 0)) {
result.restAsyncIoEnabled_ = restAsyncIoEnabled_;
}
+ if (((from_bitField0_ & 0x00000002) != 0)) {
+ result.protobufPythonicTypesEnabled_ = protobufPythonicTypesEnabled_;
+ }
}
@java.lang.Override
@@ -439,6 +492,9 @@ public Builder mergeFrom(com.google.api.PythonSettings.ExperimentalFeatures othe
if (other.getRestAsyncIoEnabled() != false) {
setRestAsyncIoEnabled(other.getRestAsyncIoEnabled());
}
+ if (other.getProtobufPythonicTypesEnabled() != false) {
+ setProtobufPythonicTypesEnabled(other.getProtobufPythonicTypesEnabled());
+ }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -471,6 +527,12 @@ public Builder mergeFrom(
bitField0_ |= 0x00000001;
break;
} // case 8
+ case 16:
+ {
+ protobufPythonicTypesEnabled_ = input.readBool();
+ bitField0_ |= 0x00000002;
+ break;
+ } // case 16
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -552,6 +614,68 @@ public Builder clearRestAsyncIoEnabled() {
return this;
}
+ private boolean protobufPythonicTypesEnabled_;
+ /**
+ *
+ *
+ *
+ * Enables generation of protobuf code using new types that are more
+ * Pythonic which are included in `protobuf>=5.29.x`. This feature will be
+ * enabled by default 1 month after launching the feature in preview
+ * packages.
+ *
+ *
+ * bool protobuf_pythonic_types_enabled = 2;
+ *
+ * @return The protobufPythonicTypesEnabled.
+ */
+ @java.lang.Override
+ public boolean getProtobufPythonicTypesEnabled() {
+ return protobufPythonicTypesEnabled_;
+ }
+ /**
+ *
+ *
+ *
+ * Enables generation of protobuf code using new types that are more
+ * Pythonic which are included in `protobuf>=5.29.x`. This feature will be
+ * enabled by default 1 month after launching the feature in preview
+ * packages.
+ *
+ *
+ * bool protobuf_pythonic_types_enabled = 2;
+ *
+ * @param value The protobufPythonicTypesEnabled to set.
+ * @return This builder for chaining.
+ */
+ public Builder setProtobufPythonicTypesEnabled(boolean value) {
+
+ protobufPythonicTypesEnabled_ = value;
+ bitField0_ |= 0x00000002;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * Enables generation of protobuf code using new types that are more
+ * Pythonic which are included in `protobuf>=5.29.x`. This feature will be
+ * enabled by default 1 month after launching the feature in preview
+ * packages.
+ *
+ *
+ * bool protobuf_pythonic_types_enabled = 2;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearProtobufPythonicTypesEnabled() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ protobufPythonicTypesEnabled_ = false;
+ onChanged();
+ return this;
+ }
+
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
index 6bbe88f418..3a7b46b386 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimit.java
@@ -392,8 +392,8 @@ public com.google.protobuf.ByteString getMetricBytes() {
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
@@ -423,8 +423,8 @@ public java.lang.String getUnit() {
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
@@ -1909,8 +1909,8 @@ public Builder setMetricBytes(com.google.protobuf.ByteString value) {
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
@@ -1939,8 +1939,8 @@ public java.lang.String getUnit() {
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
@@ -1969,8 +1969,8 @@ public com.google.protobuf.ByteString getUnitBytes() {
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
@@ -1998,8 +1998,8 @@ public Builder setUnit(java.lang.String value) {
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
@@ -2023,8 +2023,8 @@ public Builder clearUnit() {
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
diff --git a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimitOrBuilder.java b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimitOrBuilder.java
index c74a69f111..f420d609db 100644
--- a/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimitOrBuilder.java
+++ b/java-common-protos/proto-google-common-protos/src/main/java/com/google/api/QuotaLimitOrBuilder.java
@@ -214,8 +214,8 @@ public interface QuotaLimitOrBuilder
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
@@ -234,8 +234,8 @@ public interface QuotaLimitOrBuilder
*
*
* Specify the unit of the quota limit. It uses the same syntax as
- * [Metric.unit][]. The supported unit kinds are determined by the quota
- * backend system.
+ * [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ * unit kinds are determined by the quota backend system.
*
* Here are some examples:
* * "1/min/{project}" for quota per minute per project.
diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto
index 7ba1db3da0..6003be5307 100644
--- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto
+++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/client.proto
@@ -275,6 +275,12 @@ message PythonSettings {
// This feature will be enabled by default 1 month after launching the
// feature in preview packages.
bool rest_async_io_enabled = 1;
+
+ // Enables generation of protobuf code using new types that are more
+ // Pythonic which are included in `protobuf>=5.29.x`. This feature will be
+ // enabled by default 1 month after launching the feature in preview
+ // packages.
+ bool protobuf_pythonic_types_enabled = 2;
}
// Some settings.
diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/httpbody.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/httpbody.proto
index 920612dc72..32952715de 100644
--- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/httpbody.proto
+++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/httpbody.proto
@@ -18,7 +18,6 @@ package google.api;
import "google/protobuf/any.proto";
-option cc_enable_arenas = true;
option go_package = "google.golang.org/genproto/googleapis/api/httpbody;httpbody";
option java_multiple_files = true;
option java_outer_classname = "HttpBodyProto";
diff --git a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/quota.proto b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/quota.proto
index eb80cb6f02..25adb344cd 100644
--- a/java-common-protos/proto-google-common-protos/src/main/proto/google/api/quota.proto
+++ b/java-common-protos/proto-google-common-protos/src/main/proto/google/api/quota.proto
@@ -161,8 +161,8 @@ message QuotaLimit {
string metric = 8;
// Specify the unit of the quota limit. It uses the same syntax as
- // [Metric.unit][]. The supported unit kinds are determined by the quota
- // backend system.
+ // [MetricDescriptor.unit][google.api.MetricDescriptor.unit]. The supported
+ // unit kinds are determined by the quota backend system.
//
// Here are some examples:
// * "1/min/{project}" for quota per minute per project.