diff --git a/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationStub.java b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationStub.java
index 696c7938884e..078c72669cd7 100644
--- a/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationStub.java
+++ b/java-maps-addressvalidation/google-maps-addressvalidation/src/main/java/com/google/maps/addressvalidation/v1/stub/HttpJsonAddressValidationStub.java
@@ -74,12 +74,13 @@ public class HttpJsonAddressValidationStub extends AddressValidationStub {
                             Map<String, List<String>> fields = new HashMap<>();
                             ProtoRestSerializer<ValidateAddressRequest> serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
                             return fields;
                           })
                       .setRequestBodyExtractor(
                           request ->
                               ProtoRestSerializer.create()
-                                  .toBody("*", request.toBuilder().build(), false))
+                                  .toBody("*", request.toBuilder().build(), true))
                       .build())
               .setResponseParser(
                   ProtoMessageResponseParser.<ValidateAddressResponse>newBuilder()
@@ -112,12 +113,13 @@ public class HttpJsonAddressValidationStub extends AddressValidationStub {
                             Map<String, List<String>> fields = new HashMap<>();
                             ProtoRestSerializer<ProvideValidationFeedbackRequest> serializer =
                                 ProtoRestSerializer.create();
+                            serializer.putQueryParam(fields, "$alt", "json;enum-encoding=int");
                             return fields;
                           })
                       .setRequestBodyExtractor(
                           request ->
                               ProtoRestSerializer.create()
-                                  .toBody("*", request.toBuilder().build(), false))
+                                  .toBody("*", request.toBuilder().build(), true))
                       .build())
               .setResponseParser(
                   ProtoMessageResponseParser.<ProvideValidationFeedbackResponse>newBuilder()
diff --git a/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequest.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequest.java
index 8439124ea7be..73c52e91d11f 100644
--- a/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequest.java
+++ b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequest.java
@@ -345,7 +345,8 @@ public int getConclusionValue() {
    *
    *
    * <pre>
-   * Required. The ID of the response that this feedback is for. This should be the
+   * Required. The ID of the response that this feedback is for. This should be
+   * the
    * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
    * from the first response in a series of address validation attempts.
    * </pre>
@@ -370,7 +371,8 @@ public java.lang.String getResponseId() {
    *
    *
    * <pre>
-   * Required. The ID of the response that this feedback is for. This should be the
+   * Required. The ID of the response that this feedback is for. This should be
+   * the
    * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
    * from the first response in a series of address validation attempts.
    * </pre>
@@ -882,7 +884,8 @@ public Builder clearConclusion() {
      *
      *
      * <pre>
-     * Required. The ID of the response that this feedback is for. This should be the
+     * Required. The ID of the response that this feedback is for. This should be
+     * the
      * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
      * from the first response in a series of address validation attempts.
      * </pre>
@@ -906,7 +909,8 @@ public java.lang.String getResponseId() {
      *
      *
      * <pre>
-     * Required. The ID of the response that this feedback is for. This should be the
+     * Required. The ID of the response that this feedback is for. This should be
+     * the
      * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
      * from the first response in a series of address validation attempts.
      * </pre>
@@ -930,7 +934,8 @@ public com.google.protobuf.ByteString getResponseIdBytes() {
      *
      *
      * <pre>
-     * Required. The ID of the response that this feedback is for. This should be the
+     * Required. The ID of the response that this feedback is for. This should be
+     * the
      * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
      * from the first response in a series of address validation attempts.
      * </pre>
@@ -953,7 +958,8 @@ public Builder setResponseId(java.lang.String value) {
      *
      *
      * <pre>
-     * Required. The ID of the response that this feedback is for. This should be the
+     * Required. The ID of the response that this feedback is for. This should be
+     * the
      * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
      * from the first response in a series of address validation attempts.
      * </pre>
@@ -972,7 +978,8 @@ public Builder clearResponseId() {
      *
      *
      * <pre>
-     * Required. The ID of the response that this feedback is for. This should be the
+     * Required. The ID of the response that this feedback is for. This should be
+     * the
      * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
      * from the first response in a series of address validation attempts.
      * </pre>
diff --git a/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequestOrBuilder.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequestOrBuilder.java
index 5c393752652b..a18b726c88f5 100644
--- a/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequestOrBuilder.java
+++ b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/ProvideValidationFeedbackRequestOrBuilder.java
@@ -61,7 +61,8 @@ public interface ProvideValidationFeedbackRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The ID of the response that this feedback is for. This should be the
+   * Required. The ID of the response that this feedback is for. This should be
+   * the
    * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
    * from the first response in a series of address validation attempts.
    * </pre>
@@ -75,7 +76,8 @@ public interface ProvideValidationFeedbackRequestOrBuilder
    *
    *
    * <pre>
-   * Required. The ID of the response that this feedback is for. This should be the
+   * Required. The ID of the response that this feedback is for. This should be
+   * the
    * [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
    * from the first response in a series of address validation attempts.
    * </pre>
diff --git a/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Verdict.java b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Verdict.java
index 36bf8cc9536e..af36e2a27d37 100644
--- a/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Verdict.java
+++ b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/java/com/google/maps/addressvalidation/v1/Verdict.java
@@ -121,7 +121,7 @@ public enum Granularity implements com.google.protobuf.ProtocolMessageEnum {
      *
      * <pre>
      * A geocode that should be very close to the building-level location of
-     * the address. Only used for geocodes and not for addresses.
+     * the address.
      * </pre>
      *
      * <code>PREMISE_PROXIMITY = 3;</code>
@@ -198,7 +198,7 @@ public enum Granularity implements com.google.protobuf.ProtocolMessageEnum {
      *
      * <pre>
      * A geocode that should be very close to the building-level location of
-     * the address. Only used for geocodes and not for addresses.
+     * the address.
      * </pre>
      *
      * <code>PREMISE_PROXIMITY = 3;</code>
diff --git a/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address_validation_service.proto b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address_validation_service.proto
index b67b98efbb3f..ee873b8aedd4 100644
--- a/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address_validation_service.proto
+++ b/java-maps-addressvalidation/proto-google-maps-addressvalidation-v1/src/main/proto/google/maps/addressvalidation/v1/address_validation_service.proto
@@ -40,7 +40,8 @@ service AddressValidation {
   option (google.api.default_host) = "addressvalidation.googleapis.com";
 
   // Validates an address.
-  rpc ValidateAddress(ValidateAddressRequest) returns (ValidateAddressResponse) {
+  rpc ValidateAddress(ValidateAddressRequest)
+      returns (ValidateAddressResponse) {
     option (google.api.http) = {
       post: "/v1:validateAddress"
       body: "*"
@@ -52,7 +53,8 @@ service AddressValidation {
   // same address, and should be called once the transaction is concluded. This
   // should only be sent once for the sequence of `ValidateAddress` requests
   // needed to validate an address fully.
-  rpc ProvideValidationFeedback(ProvideValidationFeedbackRequest) returns (ProvideValidationFeedbackResponse) {
+  rpc ProvideValidationFeedback(ProvideValidationFeedbackRequest)
+      returns (ProvideValidationFeedbackResponse) {
     option (google.api.http) = {
       post: "/v1:provideValidationFeedback"
       body: "*"
@@ -80,7 +82,8 @@ message ValidateAddressRequest {
   // [recipients][google.type.PostalAddress.recipients] and
   // [organization][google.type.PostalAddress.organization]. Any values in those
   // fields will be discarded and not returned. Please do not set them.
-  google.type.PostalAddress address = 1 [(google.api.field_behavior) = REQUIRED];
+  google.type.PostalAddress address = 1
+      [(google.api.field_behavior) = REQUIRED];
 
   // This field must be empty for the first address validation request. If
   // more requests are necessary to fully validate a single address (for
@@ -149,7 +152,8 @@ message ProvideValidationFeedbackRequest {
   // `INVALID_ARGUMENT` error will be returned.
   ValidationConclusion conclusion = 1 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. The ID of the response that this feedback is for. This should be the
+  // Required. The ID of the response that this feedback is for. This should be
+  // the
   // [response_id][google.maps.addressvalidation.v1.ValidateAddressRequest.response_id]
   // from the first response in a series of address validation attempts.
   string response_id = 2 [(google.api.field_behavior) = REQUIRED];
@@ -158,9 +162,7 @@ message ProvideValidationFeedbackRequest {
 // The response for validation feedback.
 //
 // The response is empty if the feedback is sent successfully.
-message ProvideValidationFeedbackResponse {
-
-}
+message ProvideValidationFeedbackResponse {}
 
 // The result of validating an address.
 message ValidationResult {
@@ -202,7 +204,7 @@ message Verdict {
     PREMISE = 2;
 
     // A geocode that should be very close to the building-level location of
-    // the address. Only used for geocodes and not for addresses.
+    // the address.
     PREMISE_PROXIMITY = 3;
 
     // The address or geocode indicates a block. Only used in regions which